diff options
| author | Brian Vosburgh | 2013-02-27 19:22:37 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2013-03-05 20:01:18 +0000 |
| commit | 44dc0f2c1da4e6b928454e4aa5ed28f1f383ebb4 (patch) | |
| tree | 56c3b6061991b88c0f333606b290128f141ea6b4 | |
| parent | 79b6393d7f433da173102f9e7ade2d7d00b96b7b (diff) | |
| download | webtools.dali-44dc0f2c1da4e6b928454e4aa5ed28f1f383ebb4.tar.gz webtools.dali-44dc0f2c1da4e6b928454e4aa5ed28f1f383ebb4.tar.xz webtools.dali-44dc0f2c1da4e6b928454e4aa5ed28f1f383ebb4.zip | |
redirection: renamed Modifiable PersistentAttributes to Specified
PersistentAttributes
371 files changed, 2680 insertions, 2681 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java index 3d2304393b..62c5e00cfc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaFactory.java @@ -66,7 +66,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQuery; @@ -189,33 +189,33 @@ public interface JpaFactory JavaTypeMapping buildJavaNullTypeMapping(JavaPersistentType parent); - JavaModifiablePersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor); + JavaSpecifiedPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor); - JavaModifiablePersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField); + JavaSpecifiedPersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField); - JavaModifiablePersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter); + JavaSpecifiedPersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter); - JavaBasicMapping buildJavaBasicMapping(JavaModifiablePersistentAttribute parent); + JavaBasicMapping buildJavaBasicMapping(JavaSpecifiedPersistentAttribute parent); - JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaModifiablePersistentAttribute parent); + JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaSpecifiedPersistentAttribute parent); - JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaModifiablePersistentAttribute parent); + JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaSpecifiedPersistentAttribute parent); - JavaIdMapping buildJavaIdMapping(JavaModifiablePersistentAttribute parent); + JavaIdMapping buildJavaIdMapping(JavaSpecifiedPersistentAttribute parent); - JavaManyToManyMapping buildJavaManyToManyMapping(JavaModifiablePersistentAttribute parent); + JavaManyToManyMapping buildJavaManyToManyMapping(JavaSpecifiedPersistentAttribute parent); - JavaManyToOneMapping buildJavaManyToOneMapping(JavaModifiablePersistentAttribute parent); + JavaManyToOneMapping buildJavaManyToOneMapping(JavaSpecifiedPersistentAttribute parent); - JavaOneToManyMapping buildJavaOneToManyMapping(JavaModifiablePersistentAttribute parent); + JavaOneToManyMapping buildJavaOneToManyMapping(JavaSpecifiedPersistentAttribute parent); - JavaOneToOneMapping buildJavaOneToOneMapping(JavaModifiablePersistentAttribute parent); + JavaOneToOneMapping buildJavaOneToOneMapping(JavaSpecifiedPersistentAttribute parent); - JavaTransientMapping buildJavaTransientMapping(JavaModifiablePersistentAttribute parent); + JavaTransientMapping buildJavaTransientMapping(JavaSpecifiedPersistentAttribute parent); - JavaVersionMapping buildJavaVersionMapping(JavaModifiablePersistentAttribute parent); + JavaVersionMapping buildJavaVersionMapping(JavaSpecifiedPersistentAttribute parent); - JavaAttributeMapping buildJavaNullAttributeMapping(JavaModifiablePersistentAttribute parent); + JavaAttributeMapping buildJavaNullAttributeMapping(JavaSpecifiedPersistentAttribute parent); JavaGeneratorContainer buildJavaGeneratorContainer(JavaGeneratorContainer.ParentAdapter parentAdapter); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java index 3dede6d62e..d4723b2b42 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java @@ -34,7 +34,7 @@ public interface AttributeMapping * Return the mapping's attribute (typically its parent node in the * containment hierarchy). */ - ModifiablePersistentAttribute getPersistentAttribute(); + SpecifiedPersistentAttribute getPersistentAttribute(); /** * Return the mapping's name, which corresponds to the name of the diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java index 6345751c65..e8c77149b6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java @@ -323,6 +323,6 @@ public interface Entity * If an entity has a single id attribute, return that attribute. * Else return null. */ - ModifiablePersistentAttribute getIdAttribute(); + SpecifiedPersistentAttribute getIdAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentAttribute.java index 64db4250b5..e726b66391 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentAttribute.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.predicate.Predicate; import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaStructureNode; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; /** * Context persistent <em>attribute</em> (field or property). @@ -67,7 +67,7 @@ public interface PersistentAttribute /** * Return the attribute's mapping. This is never <code>null</code> * (although, it may be a <em>null</em> mapping). - * Set the mapping via {@link ModifiablePersistentAttribute#setMappingKey(String)}. + * Set the mapping via {@link SpecifiedPersistentAttribute#setMappingKey(String)}. */ AttributeMapping getMapping(); String MAPPING_PROPERTY = "mapping"; //$NON-NLS-1$ @@ -142,5 +142,5 @@ public interface PersistentAttribute */ boolean isVirtual(); - JavaModifiablePersistentAttribute getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute getJavaPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java index e13176efa8..c5a4abfc1e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java @@ -27,7 +27,7 @@ public interface ReadOnlyReferenceTable extends ReadOnlyTable { // TODO is this method necessary? - ModifiablePersistentAttribute getPersistentAttribute(); + SpecifiedPersistentAttribute getPersistentAttribute(); // ********** join columns ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ModifiablePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedPersistentAttribute.java index d4d1a6574d..d01e280c03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ModifiablePersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedPersistentAttribute.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context; /** - * Context persistent <em>attribute</em> (field or property). + * Specified persistent <em>attribute</em> (field or property). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -21,7 +21,7 @@ package org.eclipse.jpt.jpa.core.context; * @version 2.3 * @since 2.0 */ -public interface ModifiablePersistentAttribute +public interface SpecifiedPersistentAttribute extends PersistentAttribute, ModifiableAccessReference { /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java index 7abd151ee1..df7bc99641 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/Accessor.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -47,9 +47,9 @@ public interface Accessor * attributes and behaves as though it has no annotations. This will cause * all the settings in the Java <em>context</em> attribute to default. */ - JavaModifiablePersistentAttribute buildUnannotatedJavaAttribute(PersistentType type); + JavaSpecifiedPersistentAttribute buildUnannotatedJavaAttribute(PersistentType type); AccessType getDefaultAccess(); - JptValidator buildAttributeValidator(ModifiablePersistentAttribute persistentAttribute); + JptValidator buildAttributeValidator(SpecifiedPersistentAttribute persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/DefaultJavaAttributeMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/DefaultJavaAttributeMappingDefinition.java index d211a2871a..88b5af470a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/DefaultJavaAttributeMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/DefaultJavaAttributeMappingDefinition.java @@ -16,5 +16,5 @@ public interface DefaultJavaAttributeMappingDefinition * Return whether the definition's mapping is the "default" mapping for the * specified persistent attribute. */ - boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute); + boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMapping.java index ff5860d5ee..d029c0e808 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMapping.java @@ -28,9 +28,9 @@ import org.eclipse.jpt.jpa.core.context.AttributeMapping; public interface JavaAttributeMapping extends AttributeMapping { - JavaModifiablePersistentAttribute getParent(); + JavaSpecifiedPersistentAttribute getParent(); - JavaModifiablePersistentAttribute getPersistentAttribute(); + JavaSpecifiedPersistentAttribute getPersistentAttribute(); JavaResourceAttribute getResourceAttribute(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMappingDefinition.java index a0dbdc221e..315a795088 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeMappingDefinition.java @@ -47,9 +47,9 @@ public interface JavaAttributeMappingDefinition * <p> * <strong>NB:</strong> A mapping is not necessarily "specified" if its * annotation is present - * (see {@link org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0#isSpecified(JavaModifiablePersistentAttribute)}) + * (see {@link org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0#isSpecified(JavaSpecifiedPersistentAttribute)}) */ - boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute); + boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute); /** * Build a Java attribute mapping for the specified persistent attribute. @@ -57,5 +57,5 @@ public interface JavaAttributeMappingDefinition * the appropriate factory method instead of building a definition for the * same key. */ - JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory); + JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java index 1325c03b0e..e6f9283383 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java @@ -34,10 +34,10 @@ public interface JavaPersistentType JavaTypeMapping getMapping(); - ListIterable<JavaModifiablePersistentAttribute> getAttributes(); + ListIterable<JavaSpecifiedPersistentAttribute> getAttributes(); String ATTRIBUTES_LIST = "attributes"; //$NON-NLS-1$ - JavaModifiablePersistentAttribute getAttributeNamed(String attributeName); + JavaSpecifiedPersistentAttribute getAttributeNamed(String attributeName); // ********** Java ********** @@ -47,5 +47,5 @@ public interface JavaPersistentType */ boolean hasAnyAnnotatedAttributes(); - JavaModifiablePersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute); + JavaSpecifiedPersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaModifiablePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSpecifiedPersistentAttribute.java index 4bd5cf4996..5e7290c4f5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaModifiablePersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSpecifiedPersistentAttribute.java @@ -13,11 +13,11 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jpa.core.context.CollectionMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; /** - * Context Java persistent <em>attribute</em> (field or property). + * Java specified persistent <em>attribute</em> (field or property). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -28,8 +28,8 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; * @version 3.3 * @since 2.0 */ -public interface JavaModifiablePersistentAttribute - extends ModifiablePersistentAttribute, JavaElementReference +public interface JavaSpecifiedPersistentAttribute + extends SpecifiedPersistentAttribute, JavaElementReference { // ********** covariant overrides ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/NullOrmAttributeMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/NullOrmAttributeMappingDefinition.java index 8971819b13..d3b8daa562 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/NullOrmAttributeMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/NullOrmAttributeMappingDefinition.java @@ -56,7 +56,7 @@ public class NullOrmAttributeMappingDefinition throw new UnsupportedOperationException(); } - public OrmAttributeMapping buildContextMapping(OrmModifiablePersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { + public OrmAttributeMapping buildContextMapping(OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmNullAttributeMapping(parent, (XmlNullAttributeMapping) resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMapping.java index 89a551823a..7790195ec7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMapping.java @@ -30,9 +30,9 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; public interface OrmAttributeMapping extends AttributeMapping, TypeRefactoringParticipant { - OrmModifiablePersistentAttribute getParent(); + OrmSpecifiedPersistentAttribute getParent(); - OrmModifiablePersistentAttribute getPersistentAttribute(); + OrmSpecifiedPersistentAttribute getPersistentAttribute(); XmlAttributeMapping getXmlAttributeMapping(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMappingDefinition.java index b2d22d9732..9276c0cd98 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeMappingDefinition.java @@ -41,7 +41,7 @@ public interface OrmAttributeMappingDefinition * Build a context mapping. */ OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentAttribute.java index 2cec5e12bb..921f4ef283 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentAttribute.java @@ -16,11 +16,10 @@ import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; /** - * Context <code>orm.xml</code> persistent <em>attribute</em> - * (field or property). + * <code>orm.xml</code> persistent <em>attribute</em> (field or property). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -61,7 +60,7 @@ public interface OrmPersistentAttribute * be modified (nor are any of its parts [e.g. column]). The modifiable Java * attribute can be retrieved via {@link #resolveJavaPersistentAttribute()}. */ - JavaModifiablePersistentAttribute getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute getJavaPersistentAttribute(); String JAVA_PERSISTENT_ATTRIBUTE_PROPERTY = "javaPersistentAttribute"; //$NON-NLS-1$ /** @@ -72,7 +71,7 @@ public interface OrmPersistentAttribute * This is probably useful only to tests; since nothing else will want to * modify the returned Java attribute. */ - JavaModifiablePersistentAttribute resolveJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute resolveJavaPersistentAttribute(); JavaResourceAttribute getJavaResourceAttribute(); @@ -91,7 +90,7 @@ public interface OrmPersistentAttribute * @see #isVirtual() * @throw IllegalStateException if the attribute is already specified */ - OrmModifiablePersistentAttribute addToXml(); + OrmSpecifiedPersistentAttribute addToXml(); /** * Convert the (currently virtual) persistent attribute to a specified @@ -102,7 +101,7 @@ public interface OrmPersistentAttribute * @see #isVirtual() * @throw IllegalStateException if the attribute is already specified */ - OrmModifiablePersistentAttribute addToXml(String mappingKey); + OrmSpecifiedPersistentAttribute addToXml(String mappingKey); //TODO would like to remove this eventually void dispose(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java index 3a6c472316..210340e53b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.common.utility.iterable.ListIterable; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.resource.orm.XmlTypeMapping; @@ -58,7 +58,7 @@ public interface OrmPersistentType /** * Return the persistent type's specified attributes. */ - ListIterable<OrmModifiablePersistentAttribute> getSpecifiedAttributes(); + ListIterable<OrmSpecifiedPersistentAttribute> getSpecifiedAttributes(); /** * Return the number of the persistent type's specified attributes. @@ -92,10 +92,10 @@ public interface OrmPersistentType * <p> * Throw an {@link IllegalArgumentException} if the attribute is virtual * - * @see OrmModifiablePersistentAttribute#removeFromXml() - * @see ModifiablePersistentAttribute#isVirtual() + * @see OrmSpecifiedPersistentAttribute#removeFromXml() + * @see SpecifiedPersistentAttribute#isVirtual() */ - OrmPersistentAttribute removeAttributeFromXml(OrmModifiablePersistentAttribute specifiedAttribute); + OrmPersistentAttribute removeAttributeFromXml(OrmSpecifiedPersistentAttribute specifiedAttribute); /** * Add the specified persistent attribute to the <code>orm.xml</code>. @@ -107,9 +107,9 @@ public interface OrmPersistentType * Throw an {@link IllegalArgumentException} if the attribute is already * specified. * - * @see OrmModifiablePersistentAttribute#addToXml() + * @see OrmSpecifiedPersistentAttribute#addToXml() */ - OrmModifiablePersistentAttribute addAttributeToXml(OrmPersistentAttribute virtualAttribute); + OrmSpecifiedPersistentAttribute addAttributeToXml(OrmPersistentAttribute virtualAttribute); /** * Add the specified persistent attribute to the <code>orm.xml</code> with @@ -120,9 +120,9 @@ public interface OrmPersistentType * Throw an {@link IllegalArgumentException} if the attribute is already * specified. * - * @see OrmModifiablePersistentAttribute#addToXml(String) + * @see OrmSpecifiedPersistentAttribute#addToXml(String) */ - OrmModifiablePersistentAttribute addAttributeToXml(OrmPersistentAttribute virtualAttribute, String mappingKey); + OrmSpecifiedPersistentAttribute addAttributeToXml(OrmPersistentAttribute virtualAttribute, String mappingKey); // ********** mapping morphing ********** @@ -131,7 +131,7 @@ public interface OrmPersistentType * This is called whenever the specified persistent attribute's mapping is * changed as specified. */ - void changeMapping(OrmModifiablePersistentAttribute ormPersistentAttribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping); + void changeMapping(OrmSpecifiedPersistentAttribute ormPersistentAttribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping); // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmModifiablePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSpecifiedPersistentAttribute.java index 3494c9b57f..6fa6fc18f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmModifiablePersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSpecifiedPersistentAttribute.java @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeRefactoringParticipant; /** - * Context <code>orm.xml</code> persistent <em>attribute</em> + * <code>orm.xml</code> specified persistent <em>attribute</em> * (field or property). * <p> * Provisional API: This interface is part of an interim API that is still @@ -25,8 +25,8 @@ import org.eclipse.jpt.jpa.core.context.TypeRefactoringParticipant; * @version 3.0 * @since 2.0 */ -public interface OrmModifiablePersistentAttribute - extends ModifiablePersistentAttribute, OrmPersistentAttribute, TypeRefactoringParticipant +public interface OrmSpecifiedPersistentAttribute + extends SpecifiedPersistentAttribute, OrmPersistentAttribute, TypeRefactoringParticipant { /** * Return an <code>orm.xml</code> mapping since the attribute is diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextModelFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextModelFactory.java index 80befc5bb0..f6c5af3e01 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextModelFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextModelFactory.java @@ -101,7 +101,7 @@ public interface OrmXmlContextModelFactory * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0 */ - OrmModifiablePersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping); + OrmSpecifiedPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project @@ -178,84 +178,84 @@ public interface OrmXmlContextModelFactory * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmBasicMapping buildOrmBasicMapping(OrmModifiablePersistentAttribute parent, XmlBasic resourceMapping); + OrmBasicMapping buildOrmBasicMapping(OrmSpecifiedPersistentAttribute parent, XmlBasic resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmManyToManyMapping buildOrmManyToManyMapping(OrmModifiablePersistentAttribute parent, XmlManyToMany resourceMapping); + OrmManyToManyMapping buildOrmManyToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToMany resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmOneToManyMapping buildOrmOneToManyMapping(OrmModifiablePersistentAttribute parent, XmlOneToMany resourceMapping); + OrmOneToManyMapping buildOrmOneToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToMany resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmManyToOneMapping buildOrmManyToOneMapping(OrmModifiablePersistentAttribute parent, XmlManyToOne resourceMapping); + OrmManyToOneMapping buildOrmManyToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToOne resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmOneToOneMapping buildOrmOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlOneToOne resourceMapping); + OrmOneToOneMapping buildOrmOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToOne resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, XmlEmbeddedId resourceMapping); + OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbeddedId resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmModifiablePersistentAttribute parent, XmlEmbedded resourceMapping); + OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbedded resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmIdMapping buildOrmIdMapping(OrmModifiablePersistentAttribute parent, XmlId resourceMapping); + OrmIdMapping buildOrmIdMapping(OrmSpecifiedPersistentAttribute parent, XmlId resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmTransientMapping buildOrmTransientMapping(OrmModifiablePersistentAttribute parent, XmlTransient resourceMapping); + OrmTransientMapping buildOrmTransientMapping(OrmSpecifiedPersistentAttribute parent, XmlTransient resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmVersionMapping buildOrmVersionMapping(OrmModifiablePersistentAttribute parent, XmlVersion resourceMapping); + OrmVersionMapping buildOrmVersionMapping(OrmSpecifiedPersistentAttribute parent, XmlVersion resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmAttributeMapping buildOrmNullAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping resourceMapping); + OrmAttributeMapping buildOrmNullAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping resourceMapping); /** * NB: A factory for a version 1.0 <code>orm.xml</code> in a JPA 2.0 project * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmAttributeMapping buildUnsupportedOrmAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping resourceMapping); + OrmAttributeMapping buildUnsupportedOrmAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping resourceMapping); OrmUniqueConstraint buildOrmUniqueConstraint(JpaContextModel parent, UniqueConstraint.Owner owner, XmlUniqueConstraint resourceUniqueConstraint); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/UnsupportedOrmAttributeMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/UnsupportedOrmAttributeMappingDefinition.java index f685ebe21a..82eb312b33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/UnsupportedOrmAttributeMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/UnsupportedOrmAttributeMappingDefinition.java @@ -56,7 +56,7 @@ public class UnsupportedOrmAttributeMappingDefinition throw new UnsupportedOperationException(); } - public OrmAttributeMapping buildContextMapping(OrmModifiablePersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { + public OrmAttributeMapping buildContextMapping(OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildUnsupportedOrmAttributeMapping(parent, (XmlNullAttributeMapping) resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java index ef8116dc9e..871b014c31 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaFactory.java @@ -69,7 +69,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaNamedQuery; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQuery; @@ -213,15 +213,15 @@ public abstract class AbstractJpaFactory return new GenericJavaPersistentType(owner, jrt); } - public JavaModifiablePersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor) { return new GenericJavaPersistentAttribute(parent, accessor); } - public JavaModifiablePersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField) { return new GenericJavaPersistentAttribute(parent, resourceField); } - public JavaModifiablePersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { return new GenericJavaPersistentAttribute(parent, resourceGetter, resourceSetter); } @@ -277,47 +277,47 @@ public abstract class AbstractJpaFactory return new GenericJavaSecondaryTable(parent, owner, tableAnnotation); } - public JavaBasicMapping buildJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + public JavaBasicMapping buildJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaBasicMapping(parent); } - public JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaModifiablePersistentAttribute parent) { + public JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaEmbeddedIdMapping(parent); } - public JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaModifiablePersistentAttribute parent) { + public JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaEmbeddedMapping(parent); } - public JavaIdMapping buildJavaIdMapping(JavaModifiablePersistentAttribute parent) { + public JavaIdMapping buildJavaIdMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaIdMapping(parent); } - public JavaManyToManyMapping buildJavaManyToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaManyToManyMapping buildJavaManyToManyMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaManyToManyMapping(parent); } - public JavaManyToOneMapping buildJavaManyToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaManyToOneMapping buildJavaManyToOneMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaManyToOneMapping(parent); } - public JavaOneToManyMapping buildJavaOneToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaOneToManyMapping buildJavaOneToManyMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaOneToManyMapping(parent); } - public JavaOneToOneMapping buildJavaOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaOneToOneMapping buildJavaOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaOneToOneMapping(parent); } - public JavaTransientMapping buildJavaTransientMapping(JavaModifiablePersistentAttribute parent) { + public JavaTransientMapping buildJavaTransientMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaTransientMapping(parent); } - public JavaVersionMapping buildJavaVersionMapping(JavaModifiablePersistentAttribute parent) { + public JavaVersionMapping buildJavaVersionMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaVersionMapping(parent); } - public JavaAttributeMapping buildJavaNullAttributeMapping(JavaModifiablePersistentAttribute parent) { + public JavaAttributeMapping buildJavaNullAttributeMapping(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaNullAttributeMapping(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java index 59dfeac4f4..50453776fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -25,12 +25,12 @@ import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa2.context.SimpleMetamodelField; import org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages; import org.eclipse.jpt.jpa.db.Table; @@ -44,16 +44,16 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * It will be faulted into existence whenever {@link #getAnnotationForUpdate()} * is called. It will <em>not</em> return to <code>null</code> automatically * when all its state is defaulted; it must be explicitly cleared via - * {@link JavaModifiablePersistentAttribute#setMappingKey(String)}. + * {@link JavaSpecifiedPersistentAttribute#setMappingKey(String)}. */ public abstract class AbstractJavaAttributeMapping<A extends Annotation> - extends AbstractJavaContextModel<JavaModifiablePersistentAttribute> + extends AbstractJavaContextModel<JavaSpecifiedPersistentAttribute> implements JavaAttributeMapping, AttributeMapping2_0 { protected boolean default_; - protected AbstractJavaAttributeMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaAttributeMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.default_ = this.buildDefault(); } @@ -134,7 +134,7 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> // ********** misc ********** - public JavaModifiablePersistentAttribute getPersistentAttribute() { + public JavaSpecifiedPersistentAttribute getPersistentAttribute() { return this.parent; } @@ -174,7 +174,7 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> return this.getTypeMapping().resolveDbTable(tableName); } - protected JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this.getPersistentAttribute().getJavaPersistentAttribute(); } @@ -278,7 +278,7 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> } public String getMetamodelTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); } protected String getMetamodelFieldName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index b1fce426c1..98a91b741d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaBaseEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -56,7 +56,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> protected Embeddable targetEmbeddable; - protected AbstractJavaBaseEmbeddedMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaBaseEmbeddedMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.attributeOverrideContainer = this.buildAttributeOverrideContainer(); } @@ -314,7 +314,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<A extends Annotation> return new AttributeOverrideColumnValidator(this.getPersistentAttribute(), (AttributeOverride) override, column, new EntityTableDescriptionProvider()); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaBaseEmbeddedMapping.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 6abf4e4c2c..0c97c581cb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; @@ -63,7 +63,7 @@ public abstract class AbstractJavaBasicMapping protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.column = this.buildColumn(); this.specifiedFetch = this.buildSpecifiedFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java index 4199a50d3a..35de06895f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages; @@ -37,7 +37,7 @@ public abstract class AbstractJavaEmbeddedIdMapping protected boolean derived; - protected AbstractJavaEmbeddedIdMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaEmbeddedIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java index f4a43d39ac..317a990c03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -57,7 +57,7 @@ public abstract class AbstractJavaEmbeddedMapping protected final JavaAssociationOverrideContainer associationOverrideContainer; - protected AbstractJavaEmbeddedMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaEmbeddedMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.associationOverrideContainer = this.buildAssociationOverrideContainer(); } @@ -290,7 +290,7 @@ public abstract class AbstractJavaEmbeddedMapping return new AssociationOverrideJoinTableValidator(this.getPersistentAttribute(), override, (ReadOnlyJoinTable) table); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaEmbeddedMapping.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index 72df5ceb89..631b898a98 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -39,7 +39,7 @@ import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.InheritanceType; import org.eclipse.jpt.jpa.core.context.JpaContextModel; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.Query; @@ -1053,10 +1053,10 @@ public abstract class AbstractJavaEntity return MappingTools.getPrimaryKeyColumnName(this); } - public ModifiablePersistentAttribute getIdAttribute() { + public SpecifiedPersistentAttribute getIdAttribute() { Iterator<AttributeMapping> idAttributeMappings = this.getAllAttributeMappings(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY).iterator(); if (idAttributeMappings.hasNext()) { - ModifiablePersistentAttribute attribute = idAttributeMappings.next().getPersistentAttribute(); + SpecifiedPersistentAttribute attribute = idAttributeMappings.next().getPersistentAttribute(); return idAttributeMappings.hasNext() ? null /*more than one*/: attribute; } return null; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index 152ca00446..e86cb49cc3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -30,7 +30,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValue; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; @@ -70,7 +70,7 @@ public abstract class AbstractJavaIdMapping protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractJavaIdMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.column = this.buildColumn(); this.generatorContainer = this.buildGeneratorContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToManyMapping.java index 0cd561f2da..ab399c1f42 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToManyMapping.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; @@ -21,7 +21,7 @@ public abstract class AbstractJavaManyToManyMapping extends AbstractJavaMultiRelationshipMapping<ManyToManyAnnotation> implements ManyToManyMapping2_0, JavaManyToManyMapping { - protected AbstractJavaManyToManyMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaManyToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToOneMapping.java index 09982bda0e..9ce3b4977a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaManyToOneMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; @@ -20,7 +20,7 @@ public abstract class AbstractJavaManyToOneMapping extends AbstractJavaSingleRelationshipMapping<ManyToOneAnnotation> implements ManyToOneMapping2_0, JavaManyToOneMapping { - protected AbstractJavaManyToOneMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaManyToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 256b8ebb70..afd5f7d22f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -36,7 +36,7 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseColumn; import org.eclipse.jpt.jpa.core.context.JoinColumn; @@ -50,7 +50,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EmbeddableOverrideDescriptionProvider; @@ -64,7 +64,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaMapKeyColumn2 import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.NullMapKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.jpa2.context.MultiRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAttributeOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; @@ -115,7 +115,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi protected static final Iterable<JavaConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = IterableTools.iterable(MAP_KEY_CONVERTER_ADAPTER_ARRAY); - protected AbstractJavaMultiRelationshipMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaMultiRelationshipMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.orderable = this.buildOrderable(); @@ -933,7 +933,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -943,7 +943,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -966,7 +966,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi } protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { if (this.getPersistentAttribute().isVirtual()) { messages.add( @@ -1104,7 +1104,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return AbstractJavaMultiRelationshipMapping.this.getRelationship().getStrategy(); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaMultiRelationshipMapping.this.getPersistentAttribute(); } } @@ -1215,7 +1215,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi return AbstractJavaMultiRelationshipMapping.this.getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaMultiRelationshipMapping.this.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java index 294de640a4..810032816f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToManyMapping.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -26,7 +26,7 @@ public abstract class AbstractJavaOneToManyMapping protected final OrphanRemovable2_0 orphanRemoval; - protected AbstractJavaOneToManyMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaOneToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.orphanRemoval = this.buildOrphanRemoval(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java index 92815fe3db..a4ea0544b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOneToOneMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -26,7 +26,7 @@ public abstract class AbstractJavaOneToOneMapping protected final OrphanRemovable2_0 orphanRemoval; - protected AbstractJavaOneToOneMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.orphanRemoval = this.buildOrphanRemoval(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaModifiablePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index 1e6efed0b2..5f91ef1fba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaModifiablePersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -36,23 +36,23 @@ import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** - * Java persistent attributes + * Java persistent attribute */ -public abstract class AbstractJavaModifiablePersistentAttribute - extends AbstractJavaContextModel<PersistentType> - implements JavaModifiablePersistentAttribute, ModifiablePersistentAttribute2_0 { - +public abstract class AbstractJavaPersistentAttribute + extends AbstractJavaContextModel<PersistentType> + implements JavaSpecifiedPersistentAttribute, SpecifiedPersistentAttribute2_0 +{ protected final Accessor accessor; protected AccessType defaultAccess; @@ -63,19 +63,19 @@ public abstract class AbstractJavaModifiablePersistentAttribute protected JpaContainerDefinition jpaContainerDefinition = JpaContainerDefinition.Null.instance(); - protected AbstractJavaModifiablePersistentAttribute(PersistentType parent, JavaResourceField resourceField) { + protected AbstractJavaPersistentAttribute(PersistentType parent, JavaResourceField resourceField) { super(parent); this.accessor = new FieldAccessor(this, resourceField); this.initialize(); } - protected AbstractJavaModifiablePersistentAttribute(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { + protected AbstractJavaPersistentAttribute(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { super(parent); this.accessor = new PropertyAccessor(this, resourceGetter, resourceSetter); this.initialize(); } - protected AbstractJavaModifiablePersistentAttribute(PersistentType parent, Accessor accessor) { + protected AbstractJavaPersistentAttribute(PersistentType parent, Accessor accessor) { super(parent); this.accessor = accessor; this.initialize(); @@ -449,8 +449,8 @@ public abstract class AbstractJavaModifiablePersistentAttribute return new ContextType(this); } - public Class<JavaModifiablePersistentAttribute> getType() { - return JavaModifiablePersistentAttribute.class; + public Class<JavaSpecifiedPersistentAttribute> getType() { + return JavaSpecifiedPersistentAttribute.class; } public Iterable<JpaStructureNode> getChildren() { @@ -587,7 +587,7 @@ public abstract class AbstractJavaModifiablePersistentAttribute return this.getOwningPersistentType().getMapping(); } - public JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index 8498ff62c0..5eb4aae23e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -39,7 +39,7 @@ import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaManagedType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; @@ -70,9 +70,9 @@ public abstract class AbstractJavaPersistentType protected JavaTypeMapping mapping; // never null - protected final Vector<JavaModifiablePersistentAttribute> attributes = new Vector<JavaModifiablePersistentAttribute>(); + protected final Vector<JavaSpecifiedPersistentAttribute> attributes = new Vector<JavaSpecifiedPersistentAttribute>(); - protected final Vector<JavaModifiablePersistentAttribute> children = new Vector<JavaModifiablePersistentAttribute>(); + protected final Vector<JavaSpecifiedPersistentAttribute> children = new Vector<JavaSpecifiedPersistentAttribute>(); protected AbstractJavaPersistentType(PersistentType.Owner parent, JavaResourceType resourceType) { @@ -352,7 +352,7 @@ public abstract class AbstractJavaPersistentType // ********** attributes ********** - public ListIterable<JavaModifiablePersistentAttribute> getAttributes() { + public ListIterable<JavaSpecifiedPersistentAttribute> getAttributes() { return IterableTools.cloneLive(this.attributes); } @@ -364,13 +364,13 @@ public abstract class AbstractJavaPersistentType return this.convertToNames(this.getAttributes()); } - public JavaModifiablePersistentAttribute getAttributeNamed(String attributeName) { - Iterator<JavaModifiablePersistentAttribute> stream = this.getAttributesNamed(attributeName).iterator(); + public JavaSpecifiedPersistentAttribute getAttributeNamed(String attributeName) { + Iterator<JavaSpecifiedPersistentAttribute> stream = this.getAttributesNamed(attributeName).iterator(); return stream.hasNext() ? stream.next() : null; } - public JavaModifiablePersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute) { - for (JavaModifiablePersistentAttribute javaAttribute : this.getAttributes()) { + public JavaSpecifiedPersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute) { + for (JavaSpecifiedPersistentAttribute javaAttribute : this.getAttributes()) { if (javaAttribute.getResourceAttribute() == javaResourceAttribute) { return javaAttribute; } @@ -389,14 +389,14 @@ public abstract class AbstractJavaPersistentType return this.convertToNames(this.getAllAttributes()); } - protected Iterable<JavaModifiablePersistentAttribute> getAttributesNamed(String attributeName) { + protected Iterable<JavaSpecifiedPersistentAttribute> getAttributesNamed(String attributeName) { return IterableTools.filter(this.getAttributes(), new PersistentAttribute.NameEquals(attributeName)); } public PersistentAttribute resolveAttribute(String attributeName) { - Iterator<JavaModifiablePersistentAttribute> stream = this.getAttributesNamed(attributeName).iterator(); + Iterator<JavaSpecifiedPersistentAttribute> stream = this.getAttributesNamed(attributeName).iterator(); if (stream.hasNext()) { - JavaModifiablePersistentAttribute attribute = stream.next(); + JavaSpecifiedPersistentAttribute attribute = stream.next(); // return null if we have more than one return stream.hasNext() ? null : attribute; } @@ -408,11 +408,11 @@ public abstract class AbstractJavaPersistentType return IterableTools.transform(attrs, PersistentAttribute.NAME_TRANSFORMER); } - protected JavaModifiablePersistentAttribute buildField(JavaResourceField resourceField) { + protected JavaSpecifiedPersistentAttribute buildField(JavaResourceField resourceField) { return this.getJpaFactory().buildJavaPersistentField(this, resourceField); } - protected JavaModifiablePersistentAttribute buildProperty(JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { + protected JavaSpecifiedPersistentAttribute buildProperty(JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { return this.getJpaFactory().buildJavaPersistentProperty(this, resourceGetter, resourceSetter); } @@ -420,15 +420,15 @@ public abstract class AbstractJavaPersistentType return this.resourceType.hasAnyAnnotatedFields() || this.resourceType.hasAnyAnnotatedMethods(); } - protected void moveAttribute(int index, JavaModifiablePersistentAttribute attribute) { + protected void moveAttribute(int index, JavaSpecifiedPersistentAttribute attribute) { this.moveItemInList(index, attribute, this.attributes, ATTRIBUTES_LIST); } - protected void addAttribute(int index, JavaModifiablePersistentAttribute persistentAttribute) { + protected void addAttribute(int index, JavaSpecifiedPersistentAttribute persistentAttribute) { this.addItemToList(index, persistentAttribute, this.attributes, ATTRIBUTES_LIST); } - protected void removeAttribute(JavaModifiablePersistentAttribute attribute) { + protected void removeAttribute(JavaSpecifiedPersistentAttribute attribute) { this.removeItemFromList(attribute, this.attributes, ATTRIBUTES_LIST); } @@ -524,7 +524,7 @@ public abstract class AbstractJavaPersistentType * 2. all annotated methods(getters/setters) */ private void syncFieldAccessAttributes() { - HashSet<JavaModifiablePersistentAttribute> contextAttributes = CollectionTools.set(this.getAttributes()); + HashSet<JavaSpecifiedPersistentAttribute> contextAttributes = CollectionTools.set(this.getAttributes()); this.syncFieldAttributes(contextAttributes, buildNonTransientNonStaticResourceFieldsFilter()); this.syncAnnotatedPropertyAttributes(contextAttributes); @@ -537,7 +537,7 @@ public abstract class AbstractJavaPersistentType * 3. all annotated methods getters/setters that don't have a matching pair */ private void syncPropertyAccessAttributes() { - HashSet<JavaModifiablePersistentAttribute> contextAttributes = CollectionTools.set(this.getAttributes()); + HashSet<JavaSpecifiedPersistentAttribute> contextAttributes = CollectionTools.set(this.getAttributes()); this.syncFieldAttributes(contextAttributes, ANNOTATED_RESOURCE_FIELDS_FILTER); @@ -547,8 +547,8 @@ public abstract class AbstractJavaPersistentType JavaResourceMethod setterMethod = getValidSiblingSetMethod(getterMethod, resourceMethods); if (methodsArePersistableProperties(getterMethod, setterMethod)) { boolean match = false; - for (Iterator<JavaModifiablePersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { - JavaModifiablePersistentAttribute contextAttribute = stream.next(); + for (Iterator<JavaSpecifiedPersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { + JavaSpecifiedPersistentAttribute contextAttribute = stream.next(); if (contextAttribute.isFor(getterMethod, setterMethod)) { match = true; contextAttribute.update(); @@ -566,15 +566,15 @@ public abstract class AbstractJavaPersistentType this.syncRemainingResourceMethods(contextAttributes, resourceMethods); } - private void syncAnnotatedPropertyAttributes(HashSet<JavaModifiablePersistentAttribute> contextAttributes) { + private void syncAnnotatedPropertyAttributes(HashSet<JavaSpecifiedPersistentAttribute> contextAttributes) { Collection<JavaResourceMethod> resourceMethods = CollectionTools.collection(this.getResourceMethods()); //iterate through all resource methods searching for persistable getters for (JavaResourceMethod getterMethod : this.getResourceMethods(this.buildPersistablePropertyGetterMethodsFilter())) { JavaResourceMethod setterMethod = getValidSiblingSetMethod(getterMethod, resourceMethods); if (getterMethod.isAnnotated() || ((setterMethod != null) && setterMethod.isAnnotated())) { boolean match = false; - for (Iterator<JavaModifiablePersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { - JavaModifiablePersistentAttribute contextAttribute = stream.next(); + for (Iterator<JavaSpecifiedPersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { + JavaSpecifiedPersistentAttribute contextAttribute = stream.next(); if (contextAttribute.isFor(getterMethod, setterMethod)) { match = true; contextAttribute.update(); @@ -592,11 +592,11 @@ public abstract class AbstractJavaPersistentType this.syncRemainingResourceMethods(contextAttributes, resourceMethods); } - private void syncFieldAttributes(HashSet<JavaModifiablePersistentAttribute> contextAttributes, Predicate<JavaResourceField> filter) { + private void syncFieldAttributes(HashSet<JavaSpecifiedPersistentAttribute> contextAttributes, Predicate<JavaResourceField> filter) { for (JavaResourceField resourceField : this.getResourceFields(filter)) { boolean match = false; - for (Iterator<JavaModifiablePersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext(); ) { - JavaModifiablePersistentAttribute contextAttribute = stream.next(); + for (Iterator<JavaSpecifiedPersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext(); ) { + JavaSpecifiedPersistentAttribute contextAttribute = stream.next(); if (contextAttribute.isFor(resourceField)) { match = true; contextAttribute.update(); @@ -613,15 +613,15 @@ public abstract class AbstractJavaPersistentType } } - private void syncRemainingResourceMethods(HashSet<JavaModifiablePersistentAttribute> contextAttributes, Collection<JavaResourceMethod> resourceMethods) { + private void syncRemainingResourceMethods(HashSet<JavaSpecifiedPersistentAttribute> contextAttributes, Collection<JavaResourceMethod> resourceMethods) { //iterate through remaining resource methods and search for those that are annotated. //all getter methods will already be used. for (JavaResourceMethod resourceMethod : resourceMethods) { if (resourceMethod.isAnnotated()) { boolean match = false; //annotated setter(or other random method) with no corresponding getter, bring into context model for validation purposes - for (Iterator<JavaModifiablePersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { - JavaModifiablePersistentAttribute contextAttribute = stream.next(); + for (Iterator<JavaSpecifiedPersistentAttribute> stream = contextAttributes.iterator(); stream.hasNext();) { + JavaSpecifiedPersistentAttribute contextAttribute = stream.next(); if (contextAttribute.isFor(null, resourceMethod)) { match = true; contextAttribute.update(); @@ -636,7 +636,7 @@ public abstract class AbstractJavaPersistentType } // remove any leftover context attributes - for (JavaModifiablePersistentAttribute contextAttribute : contextAttributes) { + for (JavaSpecifiedPersistentAttribute contextAttribute : contextAttributes) { this.removeAttribute(contextAttribute); } } @@ -963,7 +963,7 @@ public abstract class AbstractJavaPersistentType this.synchronizeCollection(this.attributes, this.children, CHILDREN_COLLECTION); } - public Iterable<JavaModifiablePersistentAttribute> getChildren() { + public Iterable<JavaSpecifiedPersistentAttribute> getChildren() { return IterableTools.cloneLive(this.children); } @@ -984,7 +984,7 @@ public abstract class AbstractJavaPersistentType if (values != null) { return values; } - for (JavaModifiablePersistentAttribute attribute : this.getAttributes()) { + for (JavaSpecifiedPersistentAttribute attribute : this.getAttributes()) { values = attribute.getCompletionProposals(pos); if (values != null) { return values; @@ -1014,12 +1014,12 @@ public abstract class AbstractJavaPersistentType } protected void validateAttributes(List<IMessage> messages, IReporter reporter) { - for (JavaModifiablePersistentAttribute attribute : this.getAttributes()) { + for (JavaSpecifiedPersistentAttribute attribute : this.getAttributes()) { this.validateAttribute(attribute, reporter, messages); } } - protected void validateAttribute(JavaModifiablePersistentAttribute attribute, IReporter reporter, List<IMessage> messages) { + protected void validateAttribute(JavaSpecifiedPersistentAttribute attribute, IReporter reporter, List<IMessage> messages) { try { attribute.validate(messages, reporter); } catch(Throwable t) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index 4c5b79545b..147a26a705 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -18,12 +18,12 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaCascade; @@ -54,7 +54,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp protected FetchType defaultFetch; - protected AbstractJavaRelationshipMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaRelationshipMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.specifiedTargetEntity = this.buildSpecifiedTargetEntity(); this.relationship = this.buildRelationship(); @@ -269,11 +269,11 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp } protected String getTargetEntityIdAttributeName() { - ModifiablePersistentAttribute attribute = this.getTargetEntityIdAttribute(); + SpecifiedPersistentAttribute attribute = this.getTargetEntityIdAttribute(); return (attribute == null) ? null : attribute.getName(); } - protected ModifiablePersistentAttribute getTargetEntityIdAttribute() { + protected SpecifiedPersistentAttribute getTargetEntityIdAttribute() { Entity entity = this.getResolvedTargetEntity(); return (entity == null) ? null : entity.getIdAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index 01c7446f25..5c2e0f7f10 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaDerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; @@ -32,7 +32,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<A extends SingleRela protected final JavaDerivedIdentity2_0 derivedIdentity; - protected AbstractJavaSingleRelationshipMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaSingleRelationshipMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.specifiedOptional = this.buildSpecifiedOptional(); this.derivedIdentity = this.buildDerivedIdentity(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index f6df8fa963..2b72d749fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; @@ -56,7 +56,7 @@ public abstract class AbstractJavaVersionMapping protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractJavaVersionMapping(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaVersionMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.column = this.buildColumn(); this.converter = this.buildConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/DefaultJavaAttributeMappingDefinitionWrapper.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/DefaultJavaAttributeMappingDefinitionWrapper.java index 0e27d78676..f9fe2418a9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/DefaultJavaAttributeMappingDefinitionWrapper.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/DefaultJavaAttributeMappingDefinitionWrapper.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; public abstract class DefaultJavaAttributeMappingDefinitionWrapper extends JavaAttributeMappingDefinitionWrapper @@ -23,7 +23,7 @@ public abstract class DefaultJavaAttributeMappingDefinitionWrapper @Override protected abstract DefaultJavaAttributeMappingDefinition getDelegate(); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return this.getDelegate().isDefault(persistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java index 9039392501..fc46583d12 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/FieldAccessor.java @@ -16,11 +16,11 @@ import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaElementReference; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.PersistentFieldValidator; @@ -59,11 +59,11 @@ public class FieldAccessor return this.resourceField.isFinal(); } - public JptValidator buildAttributeValidator(ModifiablePersistentAttribute persistentAttribute) { + public JptValidator buildAttributeValidator(SpecifiedPersistentAttribute persistentAttribute) { return new PersistentFieldValidator(persistentAttribute, this); } - public JavaModifiablePersistentAttribute buildUnannotatedJavaAttribute(PersistentType type) { + public JavaSpecifiedPersistentAttribute buildUnannotatedJavaAttribute(PersistentType type) { return this.buildJavaAttribute(type, this.buildUnannotatedJavaResourceField()); } @@ -76,7 +76,7 @@ public class FieldAccessor return new UnannotatedJavaResourceField(this.resourceField); } - protected JavaModifiablePersistentAttribute buildJavaAttribute(PersistentType type, JavaResourceField javaResourceField) { + protected JavaSpecifiedPersistentAttribute buildJavaAttribute(PersistentType type, JavaResourceField javaResourceField) { return this.getJpaFactory().buildJavaPersistentField(type, javaResourceField); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java index 215dc79e22..b2ca84cf03 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappedByRelationship; @@ -234,7 +234,7 @@ public class GenericJavaMappedByRelationshipStrategy } protected IMessage buildMessage(ValidationMessage msg, Object[] args) { - ModifiablePersistentAttribute attribute = this.getRelationshipMapping().getPersistentAttribute(); + SpecifiedPersistentAttribute attribute = this.getRelationshipMapping().getPersistentAttribute(); String attributeDescription = attribute.isVirtual() ? JptJpaCoreValidationArgumentMessages.VIRTUAL_ATTRIBUTE_DESC : JptJpaCoreValidationArgumentMessages.ATTRIBUTE_DESC; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java index 69e62e129c..ff4ae66a70 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; @@ -164,7 +164,7 @@ public class GenericJavaMappingJoinColumnRelationshipStrategy return GenericJavaMappingJoinColumnRelationshipStrategy.this.getRelationshipMapping().getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return GenericJavaMappingJoinColumnRelationshipStrategy.this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java index 3727d644be..770cecbc7f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseColumn; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -173,7 +173,7 @@ public class GenericJavaOverrideJoinColumnRelationshipStrategy return GenericJavaOverrideJoinColumnRelationshipStrategy.this.getAttributeName(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { RelationshipMapping relationshipMapping = GenericJavaOverrideJoinColumnRelationshipStrategy.this.getRelationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java index 7e82b4b8b5..db44a16741 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.BaseJoinColumn; import org.eclipse.jpt.jpa.core.context.JoinColumn; @@ -286,7 +286,7 @@ public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy return this.getRelationshipMapping().getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java index 576a17878f..e563a795f7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterabl import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -209,7 +209,7 @@ public class GenericJavaVirtualJoinTable return this.getRelationshipStrategy().getRelationship().getMapping(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaAttributeMappingDefinitionWrapper.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaAttributeMappingDefinitionWrapper.java index 6e953f89ab..f512366cd9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaAttributeMappingDefinitionWrapper.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaAttributeMappingDefinitionWrapper.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; /** * Simplify delegation to another definition. @@ -36,7 +36,7 @@ public abstract class JavaAttributeMappingDefinitionWrapper return this.getDelegate().getAnnotationName(); } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return this.getDelegate().isSpecified(persistentAttribute); } @@ -44,7 +44,7 @@ public abstract class JavaAttributeMappingDefinitionWrapper return this.getDelegate().getSupportingAnnotationNames(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return this.getDelegate().buildMapping(persistentAttribute, factory); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java index a63bfae693..88aec4cf27 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; @@ -50,7 +50,7 @@ public class JavaBasicMappingDefinition return BasicAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -66,11 +66,11 @@ public class JavaBasicMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaBasicMapping(persistentAttribute); } - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.typeIsBasic(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java index 027a72418e..e40c5c536a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedIdAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -48,7 +48,7 @@ public class JavaEmbeddedIdMappingDefinition return EmbeddedIdAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -62,7 +62,7 @@ public class JavaEmbeddedIdMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaEmbeddedIdMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java index 5187a652a5..33e27667f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EmbeddedAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -48,7 +48,7 @@ public class JavaEmbeddedMappingDefinition return EmbeddedAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -62,11 +62,11 @@ public class JavaEmbeddedMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaEmbeddedMapping(persistentAttribute); } - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { String targetEmbeddable = persistentAttribute.getSingleReferenceTargetTypeName(); return (targetEmbeddable != null) && (persistentAttribute.getPersistenceUnit().getEmbeddable(targetEmbeddable) != null); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java index 7cdf1a5179..59d5d05e2c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; @@ -51,7 +51,7 @@ public class JavaIdMappingDefinition return IdAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -68,7 +68,7 @@ public class JavaIdMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaIdMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java index b4ca3897b1..51e56afd40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation; @@ -49,7 +49,7 @@ public class JavaManyToManyMappingDefinition return ManyToManyAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -64,7 +64,7 @@ public class JavaManyToManyMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaManyToManyMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java index 58669369fd..de65d8e7d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; @@ -49,7 +49,7 @@ public class JavaManyToOneMappingDefinition return ManyToOneAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -64,7 +64,7 @@ public class JavaManyToOneMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaManyToOneMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java index 55eb707a07..863e660a48 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; @@ -51,7 +51,7 @@ public class JavaOneToManyMappingDefinition return OneToManyAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -68,7 +68,7 @@ public class JavaOneToManyMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaOneToManyMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java index 50363c09ba..564a3e45e7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; @@ -50,7 +50,7 @@ public class JavaOneToOneMappingDefinition return OneToOneAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -67,7 +67,7 @@ public class JavaOneToOneMappingDefinition }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaOneToOneMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java index 6331056fb2..b9e6d570bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.TransientAnnotation; public class JavaTransientMappingDefinition @@ -46,7 +46,7 @@ public class JavaTransientMappingDefinition return TransientAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -54,7 +54,7 @@ public class JavaTransientMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return factory.buildJavaTransientMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java index 685bb31a30..4ff09849fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation;
@@ -48,7 +48,7 @@ public class JavaVersionMappingDefinition return VersionAnnotation.ANNOTATION_NAME;
}
- public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) {
+ public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) {
return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
}
@@ -62,7 +62,7 @@ public class JavaVersionMappingDefinition };
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY);
- public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) {
+ public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) {
return factory.buildJavaVersionMapping(persistentAttribute);
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java index a34336a345..5a17f34808 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java @@ -18,11 +18,11 @@ import org.eclipse.jpt.common.utility.MethodSignature; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaElementReference; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.PersistentPropertyValidator; @@ -64,7 +64,7 @@ public class PropertyAccessor return this.resourceSetter; } - public JavaModifiablePersistentAttribute buildUnannotatedJavaAttribute(PersistentType type) { + public JavaSpecifiedPersistentAttribute buildUnannotatedJavaAttribute(PersistentType type) { return this.buildJavaAttribute(type, this.buildUnannotatedJavaResourceGetter(), this.buildUnannotatedJavaResourceSetter()); } @@ -86,11 +86,11 @@ public class PropertyAccessor return new UnannotatedJavaResourceMethod(this.resourceSetter); } - protected JavaModifiablePersistentAttribute buildJavaAttribute(PersistentType type, JavaResourceMethod getterMethod, JavaResourceMethod setterMethod) { + protected JavaSpecifiedPersistentAttribute buildJavaAttribute(PersistentType type, JavaResourceMethod getterMethod, JavaResourceMethod setterMethod) { return this.getJpaFactory().buildJavaPersistentProperty(type, getterMethod, setterMethod); } - public JptValidator buildAttributeValidator(ModifiablePersistentAttribute persistentAttribute) { + public JptValidator buildAttributeValidator(SpecifiedPersistentAttribute persistentAttribute) { return new PersistentPropertyValidator(persistentAttribute, this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java index a2aa66831e..09bd72ac14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; @@ -41,7 +41,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMultiRelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmSingleRelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping; @@ -51,7 +51,7 @@ import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa2.context.SimpleMetamodelField; import org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages; @@ -60,7 +60,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> - extends AbstractOrmXmlContextModel<OrmModifiablePersistentAttribute> + extends AbstractOrmXmlContextModel<OrmSpecifiedPersistentAttribute> implements OrmAttributeMapping, AttributeMapping2_0 { // never null @@ -73,7 +73,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> protected String fullyQualifiedAttributeType; - protected AbstractOrmAttributeMapping(OrmModifiablePersistentAttribute parent, X xmlAttributeMapping) { + protected AbstractOrmAttributeMapping(OrmSpecifiedPersistentAttribute parent, X xmlAttributeMapping) { super(parent); this.xmlAttributeMapping = xmlAttributeMapping; this.name = xmlAttributeMapping.getName(); @@ -267,7 +267,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> return this.xmlAttributeMapping; } - public OrmModifiablePersistentAttribute getPersistentAttribute() { + public OrmSpecifiedPersistentAttribute getPersistentAttribute() { return this.parent; } @@ -275,7 +275,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> return this.getPersistentAttribute().getOwningTypeMapping(); } - protected JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this.getPersistentAttribute().getJavaPersistentAttribute(); } @@ -449,7 +449,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> } public String getMetamodelTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); } protected String getMetamodelFieldName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index d26b145a38..d2e9d7f42e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -57,7 +57,7 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd protected Embeddable targetEmbeddable; - protected AbstractOrmBaseEmbeddedMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmBaseEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.attributeOverrideContainer = this.buildAttributeOverrideContainer(); } @@ -303,7 +303,7 @@ public abstract class AbstractOrmBaseEmbeddedMapping<X extends AbstractXmlEmbedd return AbstractOrmBaseEmbeddedMapping.this.getValidationTextRange(); } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmBaseEmbeddedMapping.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index 908431b036..8efef14f9c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmColumnMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmLobConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; @@ -65,7 +65,7 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic> protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractOrmBasicMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmBasicMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.column = this.buildColumn(); this.specifiedFetch = this.buildSpecifiedFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index de9027c770..6cdd9f4185 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -41,7 +41,7 @@ import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.InheritanceType; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.Query; @@ -1497,10 +1497,10 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return MappingTools.getPrimaryKeyColumnName(this); } - public ModifiablePersistentAttribute getIdAttribute() { + public SpecifiedPersistentAttribute getIdAttribute() { Iterator<AttributeMapping> idAttributeMappings = this.getAllAttributeMappings(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY).iterator(); if (idAttributeMappings.hasNext()) { - ModifiablePersistentAttribute attribute = idAttributeMappings.next().getPersistentAttribute(); + SpecifiedPersistentAttribute attribute = idAttributeMappings.next().getPersistentAttribute(); return idAttributeMappings.hasNext() ? null /*more than one*/: attribute; } return null; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java index 3b0d06678b..17db14f7a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratedValue; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratorContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; @@ -69,7 +69,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId> protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractOrmIdMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmIdMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.column = this.buildColumn(); this.generatorContainer = this.buildGeneratorContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToManyMapping.java index b38f842ddf..360d69c079 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToManyMapping.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany; @@ -23,7 +23,7 @@ public abstract class AbstractOrmManyToManyMapping<X extends XmlManyToMany> extends AbstractOrmMultiRelationshipMapping<X> implements ManyToManyMapping2_0, OrmManyToManyMapping { - protected AbstractOrmManyToManyMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmManyToManyMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToOneMapping.java index 4d33fb54ad..cd60969066 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmManyToOneMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmManyToOneRelationship2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; @@ -25,7 +25,7 @@ public abstract class AbstractOrmManyToOneMapping<X extends XmlManyToOne> extends AbstractOrmSingleRelationshipMapping<X> implements ManyToOneMapping2_0, OrmManyToOneMapping { - protected AbstractOrmManyToOneMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmManyToOneMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index a6f4b3b63e..8092b9d74a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseColumn; @@ -44,7 +44,7 @@ import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedAttributeOverride; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; @@ -52,7 +52,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmMultiRelationshipMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -66,7 +66,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; import org.eclipse.jpt.jpa.core.internal.jpa2.context.MapKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.jpa2.context.MultiRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionMapping2_0; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlMultiRelationshipMapping; @@ -121,7 +121,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM }; protected static final Iterable<OrmConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = IterableTools.iterable(MAP_KEY_CONVERTER_ADAPTER_ARRAY); - protected AbstractOrmMultiRelationshipMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmMultiRelationshipMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.orderable = this.buildOrderable(); @@ -447,7 +447,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected String buildDefaultMapKeyClass() { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); return (javaAttribute == null) ? null : javaAttribute.getMultiReferenceMapKeyTypeName(); } @@ -695,7 +695,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected AttributeMapping getJavaAttributeMapping() { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); return (javaAttribute == null) ? null : javaAttribute.getMapping(); } // ********** map key join columns ********** @@ -876,7 +876,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -886,7 +886,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -977,7 +977,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { messages.add( this.buildValidationMessage( @@ -1015,7 +1015,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM protected void validateMapKeyClass(List<IMessage> messages) { if (this.isJpa2_0Compatible()) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && javaAttribute.getJpaContainerDefinition().isMap()) { this.validateMapKeyClass_(messages); } @@ -1144,7 +1144,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return AbstractOrmMultiRelationshipMapping.this.getRelationship().getStrategy(); } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmMultiRelationshipMapping.this.getPersistentAttribute(); } } @@ -1252,7 +1252,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return AbstractOrmMultiRelationshipMapping.this.getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmMultiRelationshipMapping.this.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java index 9c37480ca3..b1f77d2f5d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToManyMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -28,7 +28,7 @@ public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany> protected final OrphanRemovable2_0 orphanRemoval; - protected AbstractOrmOneToManyMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmOneToManyMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.orphanRemoval = this.buildOrphanRemoval(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java index 801e55918e..1c5a60299e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmOneToOneMapping.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -31,7 +31,7 @@ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne> protected final OrphanRemovable2_0 orphanRemoval; - protected AbstractOrmOneToOneMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmOneToOneMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.orphanRemoval = this.buildOrphanRemoval(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmModifiablePersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java index c8207b0c0e..947937266a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmModifiablePersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java @@ -30,18 +30,18 @@ import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.CollectionMapping; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAccessHolder; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages; @@ -52,9 +52,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; /** * <em>specified</em> <code>orm.xml</code> persistent attribute */ -public abstract class AbstractOrmModifiablePersistentAttribute +public abstract class AbstractOrmPersistentAttribute extends AbstractOrmXmlContextModel<OrmPersistentType> - implements OrmModifiablePersistentAttribute, ModifiablePersistentAttribute2_0 + implements OrmSpecifiedPersistentAttribute, SpecifiedPersistentAttribute2_0 { protected OrmAttributeMapping mapping; // never null @@ -68,19 +68,19 @@ public abstract class AbstractOrmModifiablePersistentAttribute * </ul> * @see #buildJavaPersistentAttribute() */ - protected JavaModifiablePersistentAttribute javaPersistentAttribute; + protected JavaSpecifiedPersistentAttribute javaPersistentAttribute; /** * If present, this Java attribute's parent is the <code>orm.xml</code> * type. */ - protected JavaModifiablePersistentAttribute cachedJavaPersistentAttribute; + protected JavaSpecifiedPersistentAttribute cachedJavaPersistentAttribute; protected AccessType specifiedAccess; protected AccessType defaultAccess; - protected AbstractOrmModifiablePersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) { + protected AbstractOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) { super(parent); this.mapping = this.buildMapping(xmlMapping); this.specifiedAccess = this.buildSpecifiedAccess(); @@ -176,11 +176,11 @@ public abstract class AbstractOrmModifiablePersistentAttribute // ********** Java persistent attribute ********** - public JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this.javaPersistentAttribute; } - public JavaModifiablePersistentAttribute resolveJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute resolveJavaPersistentAttribute() { return this.javaPersistentAttribute; } @@ -196,13 +196,13 @@ public abstract class AbstractOrmModifiablePersistentAttribute return (this.javaPersistentAttribute != null) && this.javaPersistentAttribute.isFor(javaResourceGetter, javaResourceSetter); } - protected void setJavaPersistentAttribute(JavaModifiablePersistentAttribute javaPersistentAttribute) { - JavaModifiablePersistentAttribute old = this.javaPersistentAttribute; + protected void setJavaPersistentAttribute(JavaSpecifiedPersistentAttribute javaPersistentAttribute) { + JavaSpecifiedPersistentAttribute old = this.javaPersistentAttribute; this.javaPersistentAttribute = javaPersistentAttribute; this.firePropertyChanged(JAVA_PERSISTENT_ATTRIBUTE_PROPERTY, old, javaPersistentAttribute); } - protected JavaModifiablePersistentAttribute buildJavaPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute buildJavaPersistentAttribute() { String name = this.getName(); if (name == null) { return null; @@ -213,7 +213,7 @@ public abstract class AbstractOrmModifiablePersistentAttribute } PersistentAttribute pAttribute = javaType.resolveAttribute(name); - JavaModifiablePersistentAttribute javaAttribute = (pAttribute == null) ? null : pAttribute.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = (pAttribute == null) ? null : pAttribute.getJavaPersistentAttribute(); if ((javaAttribute != null) && (javaAttribute.getAccess() == this.getAccess())) { // we only want to cache the Java persistent attribute if we built it this.cachedJavaPersistentAttribute = null; @@ -228,7 +228,7 @@ public abstract class AbstractOrmModifiablePersistentAttribute return this.getCachedJavaAttribute(); } - protected JavaModifiablePersistentAttribute getCachedJavaAttribute() { + protected JavaSpecifiedPersistentAttribute getCachedJavaAttribute() { JavaResourceType javaResourceType = this.getOwningPersistentTypeJavaType().getJavaResourceType(); if (javaResourceType == null) { return null; @@ -344,12 +344,12 @@ public abstract class AbstractOrmModifiablePersistentAttribute return this.getResourceMethods(javaResourceType, this.buildPersistablePropertyGetterMethodsFilter(javaResourceType)); } - protected JavaModifiablePersistentAttribute buildJavaPersistentField(JavaResourceField javaResourceField) { + protected JavaSpecifiedPersistentAttribute buildJavaPersistentField(JavaResourceField javaResourceField) { // pass in our parent orm persistent type as the parent to the cached Java attribute... return this.getJpaFactory().buildJavaPersistentField(this.getOwningPersistentType(), javaResourceField); } - protected JavaModifiablePersistentAttribute buildJavaPersistentProperty(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter) { + protected JavaSpecifiedPersistentAttribute buildJavaPersistentProperty(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter) { // pass in our parent orm persistent type as the parent to the cached Java attribute... return this.getJpaFactory().buildJavaPersistentProperty(this.getOwningPersistentType(), javaResourceGetter, javaResourceSetter); } @@ -426,11 +426,11 @@ public abstract class AbstractOrmModifiablePersistentAttribute return this.getOwningPersistentType().removeAttributeFromXml(this); } - public OrmModifiablePersistentAttribute addToXml() { + public OrmSpecifiedPersistentAttribute addToXml() { throw new UnsupportedOperationException(); } - public OrmModifiablePersistentAttribute addToXml(String mappingKey) { + public OrmSpecifiedPersistentAttribute addToXml(String mappingKey) { throw new UnsupportedOperationException(); } @@ -441,8 +441,8 @@ public abstract class AbstractOrmModifiablePersistentAttribute return new ContextType(this); } - public Class<OrmModifiablePersistentAttribute> getType() { - return OrmModifiablePersistentAttribute.class; + public Class<OrmSpecifiedPersistentAttribute> getType() { + return OrmSpecifiedPersistentAttribute.class; } public Iterable<JpaStructureNode> getChildren() { @@ -548,16 +548,16 @@ public abstract class AbstractOrmModifiablePersistentAttribute } public String getMetamodelTypeName() { - ModifiablePersistentAttribute2_0 javaAttribute = (ModifiablePersistentAttribute2_0) this.javaPersistentAttribute; + SpecifiedPersistentAttribute2_0 javaAttribute = (SpecifiedPersistentAttribute2_0) this.javaPersistentAttribute; return (javaAttribute != null) ? javaAttribute.getMetamodelTypeName() : MetamodelField.DEFAULT_TYPE_NAME; } - protected JavaModifiablePersistentAttribute.JpaContainerDefinition getJpaContainerDefinition() { + protected JavaSpecifiedPersistentAttribute.JpaContainerDefinition getJpaContainerDefinition() { return (this.javaPersistentAttribute != null) ? this.javaPersistentAttribute.getJpaContainerDefinition() : - JavaModifiablePersistentAttribute.JpaContainerDefinition.Null.instance(); + JavaSpecifiedPersistentAttribute.JpaContainerDefinition.Null.instance(); } // ********** completion proposals ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index 5fb8a5dd4f..88177884d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -21,13 +21,13 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -60,7 +60,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati protected FetchType defaultFetch; - protected AbstractOrmRelationshipMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmRelationshipMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.specifiedTargetEntity = xmlMapping.getTargetEntity(); this.relationship = this.buildRelationship(); @@ -294,11 +294,11 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati } protected String getTargetEntityIdAttributeName() { - ModifiablePersistentAttribute attribute = this.getTargetEntityIdAttribute(); + SpecifiedPersistentAttribute attribute = this.getTargetEntityIdAttribute(); return (attribute == null) ? null : attribute.getName(); } - protected ModifiablePersistentAttribute getTargetEntityIdAttribute() { + protected SpecifiedPersistentAttribute getTargetEntityIdAttribute() { Entity entity = this.getResolvedTargetEntity(); return (entity == null) ? null : entity.getIdAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java index 7e47ca6dee..8e2b4cdfe1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmSingleRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmDerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmDerivedIdentity2_0; @@ -33,7 +33,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<X extends AbstractXml protected final OrmDerivedIdentity2_0 derivedIdentity; - protected AbstractOrmSingleRelationshipMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmSingleRelationshipMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.specifiedOptional = xmlMapping.getOptional(); this.derivedIdentity = this.buildDerivedIdentity(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java index 6dc59171f8..b5fbf6be44 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmColumnMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -58,7 +58,7 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion> protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = IterableTools.iterable(CONVERTER_ADAPTER_ARRAY); - protected AbstractOrmVersionMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmVersionMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.column = this.buildColumn(); this.converter = this.buildConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextModelFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextModelFactory.java index 2b8fe67c6e..4fd6f36307 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextModelFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextModelFactory.java @@ -60,7 +60,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitDefaults; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmQuery; @@ -195,7 +195,7 @@ public abstract class AbstractOrmXmlContextModelFactory return new GenericOrmEmbeddable(parent, resourceMapping); } - public OrmModifiablePersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) { + public OrmSpecifiedPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) { return new GenericOrmPersistentAttribute(parent, xmlMapping); } @@ -319,51 +319,51 @@ public abstract class AbstractOrmXmlContextModelFactory return new GenericOrmQueryHint(parent, resourceQueryHint); } - public OrmBasicMapping buildOrmBasicMapping(OrmModifiablePersistentAttribute parent, XmlBasic resourceMapping) { + public OrmBasicMapping buildOrmBasicMapping(OrmSpecifiedPersistentAttribute parent, XmlBasic resourceMapping) { return new GenericOrmBasicMapping(parent, resourceMapping); } - public OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmModifiablePersistentAttribute parent, XmlEmbedded resourceMapping) { + public OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbedded resourceMapping) { return new GenericOrmEmbeddedMapping(parent, resourceMapping); } - public OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, XmlEmbeddedId resourceMapping) { + public OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbeddedId resourceMapping) { return new GenericOrmEmbeddedIdMapping(parent, resourceMapping); } - public OrmIdMapping buildOrmIdMapping(OrmModifiablePersistentAttribute parent, XmlId resourceMapping) { + public OrmIdMapping buildOrmIdMapping(OrmSpecifiedPersistentAttribute parent, XmlId resourceMapping) { return new GenericOrmIdMapping(parent, resourceMapping); } - public OrmManyToManyMapping buildOrmManyToManyMapping(OrmModifiablePersistentAttribute parent, XmlManyToMany resourceMapping) { + public OrmManyToManyMapping buildOrmManyToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToMany resourceMapping) { return new GenericOrmManyToManyMapping(parent, resourceMapping); } - public OrmManyToOneMapping buildOrmManyToOneMapping(OrmModifiablePersistentAttribute parent, XmlManyToOne resourceMapping) { + public OrmManyToOneMapping buildOrmManyToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToOne resourceMapping) { return new GenericOrmManyToOneMapping(parent, resourceMapping); } - public OrmOneToManyMapping buildOrmOneToManyMapping(OrmModifiablePersistentAttribute parent, XmlOneToMany resourceMapping) { + public OrmOneToManyMapping buildOrmOneToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToMany resourceMapping) { return new GenericOrmOneToManyMapping(parent, resourceMapping); } - public OrmOneToOneMapping buildOrmOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlOneToOne resourceMapping) { + public OrmOneToOneMapping buildOrmOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToOne resourceMapping) { return new GenericOrmOneToOneMapping(parent, resourceMapping); } - public OrmTransientMapping buildOrmTransientMapping(OrmModifiablePersistentAttribute parent, XmlTransient resourceMapping) { + public OrmTransientMapping buildOrmTransientMapping(OrmSpecifiedPersistentAttribute parent, XmlTransient resourceMapping) { return new GenericOrmTransientMapping(parent, resourceMapping); } - public OrmVersionMapping buildOrmVersionMapping(OrmModifiablePersistentAttribute parent, XmlVersion resourceMapping) { + public OrmVersionMapping buildOrmVersionMapping(OrmSpecifiedPersistentAttribute parent, XmlVersion resourceMapping) { return new GenericOrmVersionMapping(parent, resourceMapping); } - public OrmAttributeMapping buildOrmNullAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping resourceMapping) { + public OrmAttributeMapping buildOrmNullAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping resourceMapping) { return new GenericOrmNullAttributeMapping(parent, resourceMapping); } - public OrmAttributeMapping buildUnsupportedOrmAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping resourceMapping) { + public OrmAttributeMapping buildUnsupportedOrmAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping resourceMapping) { return new UnsupportedOrmAttributeMapping(parent, resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java index f0d818aef6..1269f08872 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMappedByRelationship; @@ -201,7 +201,7 @@ public class GenericOrmMappedByRelationshipStrategy } protected IMessage buildMessage(ValidationMessage msg, Object[] args) { - ModifiablePersistentAttribute attribute = this.getRelationshipMapping().getPersistentAttribute(); + SpecifiedPersistentAttribute attribute = this.getRelationshipMapping().getPersistentAttribute(); String attributeDescription = NLS.bind(JptJpaCoreValidationArgumentMessages.ATTRIBUTE_DESC, attribute.getName()); args = ArrayTools.add(args, 0, attributeDescription); return this.buildValidationMessage(this.getValidationTextRange(), msg, args); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java index 32a8cf5f4a..e0f912284d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinColumnRelationshipStrategy.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; @@ -119,7 +119,7 @@ public class GenericOrmMappingJoinColumnRelationshipStrategy return GenericOrmMappingJoinColumnRelationshipStrategy.this.getRelationshipMapping().getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return GenericOrmMappingJoinColumnRelationshipStrategy.this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java index 95f2ac6b2d..13a350ec32 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappingJoinTableRelationshipStrategy.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; @@ -52,7 +52,7 @@ public class GenericOrmMappingJoinTableRelationshipStrategy return this.getRelationship().getValidationTextRange(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java index b650de6b59..82e8dcbe5c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOverrideJoinColumnRelationshipStrategy.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseColumn; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -138,7 +138,7 @@ public class GenericOrmOverrideJoinColumnRelationshipStrategy return GenericOrmOverrideJoinColumnRelationshipStrategy.this.getAttributeName(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { RelationshipMapping relationshipMapping = GenericOrmOverrideJoinColumnRelationshipStrategy.this.getRelationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index 0798a3c4e0..f70abbafe1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.BaseJoinColumn; import org.eclipse.jpt.jpa.core.context.JoinColumn; @@ -273,7 +273,7 @@ public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy return this.getRelationshipMapping().getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java index b19d1b7a39..897edb345c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterabl import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -209,7 +209,7 @@ public class GenericOrmVirtualJoinTable return this.getRelationshipStrategy().getRelationship().getMapping(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java index f108e80628..4517f900d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmBasicMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmBasicMappingDefinition } public OrmBasicMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmBasicMapping(parent, (XmlBasic) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java index 89f3853d2c..e9b5caaf64 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedIdMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmEmbeddedIdMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmEmbeddedIdMapping(parent, (XmlEmbeddedId) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java index ea78936eb7..a9961c4735 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmEmbeddedMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmEmbeddedMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmEmbeddedMapping(parent, (XmlEmbedded) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java index 4fc8cfaa6d..8740752180 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmIdMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmIdMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmIdMapping(parent, (XmlId) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java index bee7d07250..4488f703a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToManyMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmManyToManyMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmManyToManyMapping(parent, (XmlManyToMany) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java index 3c536c089a..ab5bc532ae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmManyToOneMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmManyToOneMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmManyToOneMapping(parent, (XmlManyToOne) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java index c0002b486f..78c50b242e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToManyMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmOneToManyMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmOneToManyMapping(parent, (XmlOneToMany) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java index 51961ce8c4..a840a23be3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmOneToOneMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmOneToOneMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmOneToOneMapping(parent, (XmlOneToOne) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java index ca2b993b7a..57efc5afae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmTransientMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmTransientMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmTransientMapping(parent, (XmlTransient) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java index 7d2b0ebffd..49fc504ed9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/OrmVersionMappingDefinition.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -56,7 +56,7 @@ public class OrmVersionMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return factory.buildOrmVersionMapping(parent, (XmlVersion) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java index f4bd75cebb..8e95effefc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java @@ -47,7 +47,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; @@ -85,7 +85,7 @@ public abstract class SpecifiedOrmPersistentType protected AccessType specifiedAccess; protected AccessType defaultAccess; // never null - protected final Vector<OrmModifiablePersistentAttribute> specifiedAttributes = new Vector<OrmModifiablePersistentAttribute>(); + protected final Vector<OrmSpecifiedPersistentAttribute> specifiedAttributes = new Vector<OrmSpecifiedPersistentAttribute>(); protected final SpecifiedAttributeContainerAdapter specifiedAttributeContainerAdapter = new SpecifiedAttributeContainerAdapter(); protected final Vector<OrmPersistentAttribute> defaultAttributes = new Vector<OrmPersistentAttribute>(); @@ -312,11 +312,11 @@ public abstract class SpecifiedOrmPersistentType // ********** attribute conversions ********** - public OrmModifiablePersistentAttribute addAttributeToXml(OrmPersistentAttribute defaultAttribute) { + public OrmSpecifiedPersistentAttribute addAttributeToXml(OrmPersistentAttribute defaultAttribute) { return this.addAttributeToXml(defaultAttribute, defaultAttribute.getMappingKey()); } - public OrmModifiablePersistentAttribute addAttributeToXml(OrmPersistentAttribute defaultAttribute, String mappingKey) { + public OrmSpecifiedPersistentAttribute addAttributeToXml(OrmPersistentAttribute defaultAttribute, String mappingKey) { if ( ! defaultAttribute.isVirtual()) { throw new IllegalArgumentException("Attribute is already specified: " + defaultAttribute); //$NON-NLS-1$ } @@ -332,7 +332,7 @@ public abstract class SpecifiedOrmPersistentType * attribute before triggering an <em>update</em> or the dangling * default attribute will be removed preemptively. */ - protected OrmModifiablePersistentAttribute convertAttributeToSpecified_(OrmPersistentAttribute defaultAttribute, String mappingKey) { + protected OrmSpecifiedPersistentAttribute convertAttributeToSpecified_(OrmPersistentAttribute defaultAttribute, String mappingKey) { // silently remove the default attribute int defaultIndex = this.defaultAttributes.indexOf(defaultAttribute); this.defaultAttributes.remove(defaultIndex); @@ -342,7 +342,7 @@ public abstract class SpecifiedOrmPersistentType OrmAttributeMappingDefinition md = this.getMappingFileDefinition().getAttributeMappingDefinition(mappingKey); XmlAttributeMapping xmlMapping = md.buildResourceMapping(this.getResourceModelFactory()); - OrmModifiablePersistentAttribute specifiedAttribute = this.buildSpecifiedAttribute(xmlMapping); + OrmSpecifiedPersistentAttribute specifiedAttribute = this.buildSpecifiedAttribute(xmlMapping); // we need to add the attribute to the right spot in the list - stupid spec... int specifiedIndex = this.getSpecifiedAttributeInsertionIndex(specifiedAttribute); this.specifiedAttributes.add(specifiedIndex, specifiedAttribute); @@ -369,17 +369,17 @@ public abstract class SpecifiedOrmPersistentType return specifiedAttribute; } - protected int getSpecifiedAttributeInsertionIndex(OrmModifiablePersistentAttribute attribute) { + protected int getSpecifiedAttributeInsertionIndex(OrmSpecifiedPersistentAttribute attribute) { return ListTools.insertionIndexOf(this.specifiedAttributes, attribute, this.getAttributeComparator()); } - protected Comparator<OrmModifiablePersistentAttribute> getAttributeComparator() { + protected Comparator<OrmSpecifiedPersistentAttribute> getAttributeComparator() { return ATTRIBUTE_COMPARATOR; } - protected static final Comparator<OrmModifiablePersistentAttribute> ATTRIBUTE_COMPARATOR = - new Comparator<OrmModifiablePersistentAttribute>() { - public int compare(OrmModifiablePersistentAttribute attribute1, OrmModifiablePersistentAttribute attribute2) { + protected static final Comparator<OrmSpecifiedPersistentAttribute> ATTRIBUTE_COMPARATOR = + new Comparator<OrmSpecifiedPersistentAttribute>() { + public int compare(OrmSpecifiedPersistentAttribute attribute1, OrmSpecifiedPersistentAttribute attribute2) { int seq1 = attribute1.getMapping().getXmlSequence(); int seq2 = attribute2.getMapping().getXmlSequence(); return (seq1 == seq2) ? 0 : (seq1 < seq2) ? -1 : 1; @@ -391,7 +391,7 @@ public abstract class SpecifiedOrmPersistentType * specified attribute, or the <em>update</em> will discover the missing * default attribute and add it preemptively. */ - public OrmPersistentAttribute removeAttributeFromXml(OrmModifiablePersistentAttribute specifiedAttribute) { + public OrmPersistentAttribute removeAttributeFromXml(OrmSpecifiedPersistentAttribute specifiedAttribute) { if (specifiedAttribute.isVirtual()) { throw new IllegalArgumentException("Attribute is not specified: " + specifiedAttribute); //$NON-NLS-1$ } @@ -438,7 +438,7 @@ public abstract class SpecifiedOrmPersistentType * valid Java resource attributes and it must not correspond to any of the * remaining specified attributes. */ - protected boolean javaResourceFieldWillBeDefault(JavaResourceField javaResourceField, OrmModifiablePersistentAttribute specifiedAttributeToBeRemoved) { + protected boolean javaResourceFieldWillBeDefault(JavaResourceField javaResourceField, OrmSpecifiedPersistentAttribute specifiedAttributeToBeRemoved) { return IterableTools.contains(this.getJavaResourceFields(), javaResourceField) && (this.getSpecifiedAttributeFor(javaResourceField, specifiedAttributeToBeRemoved) == null); } @@ -450,7 +450,7 @@ public abstract class SpecifiedOrmPersistentType * valid Java resource attributes and it must not correspond to any of the * remaining specified attributes. */ - protected boolean javaResourcePropertyWillBeDefault(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter, OrmModifiablePersistentAttribute specifiedAttributeToBeRemoved) { + protected boolean javaResourcePropertyWillBeDefault(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter, OrmSpecifiedPersistentAttribute specifiedAttributeToBeRemoved) { return IterableTools.contains(this.getJavaResourceMethods(), javaResourceGetter) && IterableTools.contains(this.getJavaResourceMethods(), javaResourceSetter) && (this.getSpecifiedAttributeFor(javaResourceGetter, javaResourceSetter, specifiedAttributeToBeRemoved) == null); @@ -489,7 +489,7 @@ public abstract class SpecifiedOrmPersistentType // ********** specified attributes ********** - public ListIterable<OrmModifiablePersistentAttribute> getSpecifiedAttributes() { + public ListIterable<OrmSpecifiedPersistentAttribute> getSpecifiedAttributes() { return IterableTools.cloneLive(this.specifiedAttributes); } @@ -501,13 +501,13 @@ public abstract class SpecifiedOrmPersistentType return this.specifiedAttributes.size(); } - protected void removeSpecifiedAttribute(OrmModifiablePersistentAttribute attribute) { + protected void removeSpecifiedAttribute(OrmSpecifiedPersistentAttribute attribute) { this.removeSpecifiedAttribute_(attribute); attribute.getMapping().removeXmlAttributeMappingFrom(this.getXmlAttributes()); this.removeXmlAttributesIfUnset(); } - public void changeMapping(OrmModifiablePersistentAttribute attribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping) { + public void changeMapping(OrmSpecifiedPersistentAttribute attribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping) { // keep the context model in sync with each change to the resource model int sourceIndex = this.specifiedAttributes.indexOf(attribute); this.specifiedAttributes.remove(sourceIndex); @@ -533,7 +533,7 @@ public abstract class SpecifiedOrmPersistentType return (xmlAttributes != null) ? xmlAttributes.getAttributeMappings() : EmptyIterable.<XmlAttributeMapping>instance(); } - protected OrmModifiablePersistentAttribute buildSpecifiedAttribute(XmlAttributeMapping xmlMapping) { + protected OrmSpecifiedPersistentAttribute buildSpecifiedAttribute(XmlAttributeMapping xmlMapping) { return this.getContextModelFactory().buildOrmPersistentAttribute(this, xmlMapping); } @@ -541,16 +541,16 @@ public abstract class SpecifiedOrmPersistentType ContextContainerTools.synchronizeWithResourceModel(this.specifiedAttributeContainerAdapter); } - protected void moveSpecifiedAttribute_(int index, OrmModifiablePersistentAttribute attribute) { + protected void moveSpecifiedAttribute_(int index, OrmSpecifiedPersistentAttribute attribute) { this.moveItemInList(index, attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST); } protected void addSpecifiedAttribute_(int index, XmlAttributeMapping xmlMapping) { - OrmModifiablePersistentAttribute attribute = this.buildSpecifiedAttribute(xmlMapping); + OrmSpecifiedPersistentAttribute attribute = this.buildSpecifiedAttribute(xmlMapping); this.addItemToList(index, attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST); } - protected void removeSpecifiedAttribute_(OrmModifiablePersistentAttribute attribute) { + protected void removeSpecifiedAttribute_(OrmSpecifiedPersistentAttribute attribute) { this.removeItemFromList(attribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST); } @@ -558,24 +558,24 @@ public abstract class SpecifiedOrmPersistentType * specified attribute container adapter */ protected class SpecifiedAttributeContainerAdapter - implements ContextContainerTools.Adapter<OrmModifiablePersistentAttribute, XmlAttributeMapping> + implements ContextContainerTools.Adapter<OrmSpecifiedPersistentAttribute, XmlAttributeMapping> { - public Iterable<OrmModifiablePersistentAttribute> getContextElements() { + public Iterable<OrmSpecifiedPersistentAttribute> getContextElements() { return SpecifiedOrmPersistentType.this.getSpecifiedAttributes(); } public Iterable<XmlAttributeMapping> getResourceElements() { return SpecifiedOrmPersistentType.this.getXmlAttributeMappings(); } - public XmlAttributeMapping getResourceElement(OrmModifiablePersistentAttribute contextElement) { + public XmlAttributeMapping getResourceElement(OrmSpecifiedPersistentAttribute contextElement) { return contextElement.getMapping().getXmlAttributeMapping(); } - public void moveContextElement(int index, OrmModifiablePersistentAttribute element) { + public void moveContextElement(int index, OrmSpecifiedPersistentAttribute element) { SpecifiedOrmPersistentType.this.moveSpecifiedAttribute_(index, element); } public void addContextElement(int index, XmlAttributeMapping resourceElement) { SpecifiedOrmPersistentType.this.addSpecifiedAttribute_(index, resourceElement); } - public void removeContextElement(OrmModifiablePersistentAttribute element) { + public void removeContextElement(OrmSpecifiedPersistentAttribute element) { SpecifiedOrmPersistentType.this.removeSpecifiedAttribute_(element); } } @@ -814,7 +814,7 @@ public abstract class SpecifiedOrmPersistentType return this.getSpecifiedAttributeFor(javaResourceField) == null; } - protected OrmModifiablePersistentAttribute getSpecifiedAttributeFor(JavaResourceField javaResourceField) { + protected OrmSpecifiedPersistentAttribute getSpecifiedAttributeFor(JavaResourceField javaResourceField) { return this.getSpecifiedAttributeFor(javaResourceField, null); } @@ -824,8 +824,8 @@ public abstract class SpecifiedOrmPersistentType * there can be more than one specified attribute per Java resource * attribute; albeit erroneously). */ - protected OrmModifiablePersistentAttribute getSpecifiedAttributeFor(JavaResourceField javaResourceField, OrmModifiablePersistentAttribute exclude) { - for (OrmModifiablePersistentAttribute ormAttribute : this.getSpecifiedAttributes()) { + protected OrmSpecifiedPersistentAttribute getSpecifiedAttributeFor(JavaResourceField javaResourceField, OrmSpecifiedPersistentAttribute exclude) { + for (OrmSpecifiedPersistentAttribute ormAttribute : this.getSpecifiedAttributes()) { if (ormAttribute == exclude) { continue; // skip } @@ -840,7 +840,7 @@ public abstract class SpecifiedOrmPersistentType return this.getSpecifiedAttributeFor(javaResourceGetter, javaResourceSetter) == null; } - protected OrmModifiablePersistentAttribute getSpecifiedAttributeFor(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter) { + protected OrmSpecifiedPersistentAttribute getSpecifiedAttributeFor(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter) { return this.getSpecifiedAttributeFor(javaResourceGetter, javaResourceSetter, null); } @@ -850,8 +850,8 @@ public abstract class SpecifiedOrmPersistentType * there can be more than one specified attribute per Java resource * attribute; albeit erroneously). */ - protected OrmModifiablePersistentAttribute getSpecifiedAttributeFor(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter, OrmModifiablePersistentAttribute exclude) { - for (OrmModifiablePersistentAttribute ormAttribute : this.getSpecifiedAttributes()) { + protected OrmSpecifiedPersistentAttribute getSpecifiedAttributeFor(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter, OrmSpecifiedPersistentAttribute exclude) { + for (OrmSpecifiedPersistentAttribute ormAttribute : this.getSpecifiedAttributes()) { if (ormAttribute == exclude) { continue; // skip } @@ -1189,7 +1189,7 @@ public abstract class SpecifiedOrmPersistentType if (result != null) { return result; } - for (OrmModifiablePersistentAttribute attribute : this.getSpecifiedAttributes()) { + for (OrmSpecifiedPersistentAttribute attribute : this.getSpecifiedAttributes()) { result = attribute.getCompletionProposals(pos); if (result != null) { return result; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java index 5c87020737..dc3bf3ad04 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/VirtualOrmPersistentAttribute.java @@ -25,15 +25,15 @@ import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.java.FieldAccessor; import org.eclipse.jpt.jpa.core.internal.context.java.PropertyAccessor; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -57,7 +57,7 @@ public class VirtualOrmPersistentAttribute * The {@link #originalJavaAttributeListener} keeps this attribute in sync * with any changes made via the Java context model. */ - protected final JavaModifiablePersistentAttribute annotatedJavaAttribute; + protected final JavaSpecifiedPersistentAttribute annotatedJavaAttribute; /** * This is the "original" Java persistent attribute corresponding to @@ -70,7 +70,7 @@ public class VirtualOrmPersistentAttribute * is no Java context attribute, the Java resource model can only be * modified via source code editing and we will <em>sync</em> appropriately). */ - protected JavaModifiablePersistentAttribute originalJavaAttribute; + protected JavaSpecifiedPersistentAttribute originalJavaAttribute; protected StateChangeListener originalJavaAttributeListener; /** @@ -82,7 +82,7 @@ public class VirtualOrmPersistentAttribute * The {@link #originalJavaAttributeListener} keeps this attribute in sync * with any changes made via the Java context model. */ - protected JavaModifiablePersistentAttribute unannotatedJavaAttribute; + protected JavaSpecifiedPersistentAttribute unannotatedJavaAttribute; protected JavaAttributeMapping mapping; // never null @@ -154,38 +154,38 @@ public class VirtualOrmPersistentAttribute // ********** Java persistent attribute ********** - public JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this.getOwningTypeMapping().isMetadataComplete() ? this.getUnannotatedJavaAttribute() : this.annotatedJavaAttribute; } - public JavaModifiablePersistentAttribute resolveJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute resolveJavaPersistentAttribute() { JavaPersistentType javaType = this.getOwningPersistentType().getJavaPersistentType(); return (javaType == null) ? null : javaType.getAttributeFor(this.getJavaResourceAttribute()); } - protected ModifiablePersistentAttribute2_0 getJavaPersistentAttribute2_0() { - return (ModifiablePersistentAttribute2_0) this.getJavaPersistentAttribute(); + protected SpecifiedPersistentAttribute2_0 getJavaPersistentAttribute2_0() { + return (SpecifiedPersistentAttribute2_0) this.getJavaPersistentAttribute(); } - protected JavaModifiablePersistentAttribute buildAnnotatedJavaAttribute() { + protected JavaSpecifiedPersistentAttribute buildAnnotatedJavaAttribute() { return buildJavaAttribute(this.javaAccessor); } - protected JavaModifiablePersistentAttribute getUnannotatedJavaAttribute() { + protected JavaSpecifiedPersistentAttribute getUnannotatedJavaAttribute() { if (this.unannotatedJavaAttribute == null) { this.unannotatedJavaAttribute = this.buildUnannotatedJavaAttribute(); } return this.unannotatedJavaAttribute; } - protected JavaModifiablePersistentAttribute buildUnannotatedJavaAttribute() { + protected JavaSpecifiedPersistentAttribute buildUnannotatedJavaAttribute() { // pass in the orm persistent type as the parent... return this.javaAccessor.buildUnannotatedJavaAttribute(this.getOwningPersistentType()); } - protected JavaModifiablePersistentAttribute buildJavaAttribute(Accessor accessor) { + protected JavaSpecifiedPersistentAttribute buildJavaAttribute(Accessor accessor) { // pass in the orm persistent type as the parent... return this.getJpaFactory().buildJavaPersistentAttribute(this.getOwningPersistentType(), accessor); } @@ -223,7 +223,7 @@ public class VirtualOrmPersistentAttribute // ********** original Java persistent attribute ********** protected void updateOriginalJavaAttribute() { - JavaModifiablePersistentAttribute newJavaAttribute = this.resolveJavaPersistentAttribute(); //yes, this is the "original" java attribute + JavaSpecifiedPersistentAttribute newJavaAttribute = this.resolveJavaPersistentAttribute(); //yes, this is the "original" java attribute if (newJavaAttribute != this.originalJavaAttribute) { if (newJavaAttribute == null) { this.originalJavaAttribute.removeStateChangeListener(this.getOriginalJavaAttributeListener()); @@ -278,14 +278,14 @@ public class VirtualOrmPersistentAttribute return true; } - public OrmModifiablePersistentAttribute addToXml() { + public OrmSpecifiedPersistentAttribute addToXml() { if (this.mapping.getKey() == null) { throw new IllegalStateException("Use addToXml(String) instead and specify a mapping type"); //$NON-NLS-1$ } return this.getOwningPersistentType().addAttributeToXml(this); } - public OrmModifiablePersistentAttribute addToXml(String mappingKey) { + public OrmSpecifiedPersistentAttribute addToXml(String mappingKey) { return this.getOwningPersistentType().addAttributeToXml(this, mappingKey); } @@ -296,8 +296,8 @@ public class VirtualOrmPersistentAttribute return new ContextType(this); } - public Class<OrmModifiablePersistentAttribute> getType() { - return OrmModifiablePersistentAttribute.class; + public Class<OrmSpecifiedPersistentAttribute> getType() { + return OrmSpecifiedPersistentAttribute.class; } public Iterable<JpaStructureNode> getChildren() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java index 16691e3767..0158723622 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java @@ -30,7 +30,7 @@ import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.context.IdTypeMapping; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.PropertyAccessor; @@ -192,7 +192,7 @@ public abstract class AbstractPrimaryKeyValidator return; } - for (JavaModifiablePersistentAttribute idClassAttribute : this.getAllIdClassAttributes(idClass)) { + for (JavaSpecifiedPersistentAttribute idClassAttribute : this.getAllIdClassAttributes(idClass)) { boolean foundMatch = false; for (AttributeMapping attributeMapping : getAttributeMappings(typeMapping())) { if (idClassAttribute.getName().equals(attributeMapping.getName())) { @@ -364,7 +364,7 @@ public abstract class AbstractPrimaryKeyValidator protected void validateIdClassPropertyMethods( JavaPersistentType idClass, List<IMessage> messages, IReporter reporter) { - for (JavaModifiablePersistentAttribute attribute : getAllIdClassAttributes(idClass)) { + for (JavaSpecifiedPersistentAttribute attribute : getAllIdClassAttributes(idClass)) { PropertyAccessor accessor = (PropertyAccessor)attribute.getAccessor(); // validate getter method @@ -403,8 +403,8 @@ public abstract class AbstractPrimaryKeyValidator return IterableTools.transform(getAllIdClassAttributes(idClass), PersistentAttribute.NAME_TRANSFORMER); } - protected Iterable<JavaModifiablePersistentAttribute> getAllIdClassAttributes(JavaPersistentType idClass) { - return new SubIterableWrapper<PersistentAttribute, JavaModifiablePersistentAttribute>(idClass.getAllAttributes()); + protected Iterable<JavaSpecifiedPersistentAttribute> getAllIdClassAttributes(JavaPersistentType idClass) { + return new SubIterableWrapper<PersistentAttribute, JavaSpecifiedPersistentAttribute>(idClass.getAllAttributes()); } protected Iterable<String> getIdClassFieldNames(JavaPersistentType idClass) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java index e8e3cb7014..5d3e5329d6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.utility.ValidationMessage; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -34,7 +34,7 @@ public abstract class AbstractTemporalConverterValidator return this.converter.getParent(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return this.getAttributeMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBasicMapping.java index f995a29ba0..81d489df7d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaBasicMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMapping; public class GenericJavaBasicMapping extends AbstractJavaBasicMapping { - public GenericJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java index 3f66763116..34145db9ef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedIdMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEmbeddedIdMapping; /** @@ -19,7 +19,7 @@ public class GenericJavaEmbeddedIdMapping extends AbstractJavaEmbeddedIdMapping { - public GenericJavaEmbeddedIdMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaEmbeddedIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java index f510f57b5f..b26022ef23 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEmbeddedMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEmbeddedMapping; /** @@ -19,7 +19,7 @@ public class GenericJavaEmbeddedMapping extends AbstractJavaEmbeddedMapping { - public GenericJavaEmbeddedMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaEmbeddedMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaIdMapping.java index 26e18e2383..558ea7d492 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaIdMapping.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMapping; public class GenericJavaIdMapping extends AbstractJavaIdMapping { - public GenericJavaIdMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java index e720e1e4fb..a3b3c9dce9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterabl import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -274,7 +274,7 @@ public class GenericJavaJoinTable return this.getRelationshipStrategy().getRelationship().getMapping(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToManyMapping.java index d55675ac9d..7e3b965886 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToManyMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMapping; public class GenericJavaManyToManyMapping extends AbstractJavaManyToManyMapping { - public GenericJavaManyToManyMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaManyToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToOneMapping.java index 52827bfa8b..9fa7d9e27d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaManyToOneMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMapping; public class GenericJavaManyToOneMapping extends AbstractJavaManyToOneMapping { - public GenericJavaManyToOneMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaManyToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java index ab39acad18..545e923c10 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaMappingJoinTableRelationshipStrategy.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.jpa.core.context.JoinTable; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -78,7 +78,7 @@ public class GenericJavaMappingJoinTableRelationshipStrategy return this.getRelationshipMapping().validatesAgainstDatabase(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNullAttributeMapping.java index 2d077c73c2..a49459d098 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNullAttributeMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; public class GenericJavaNullAttributeMapping extends AbstractJavaAttributeMapping<Annotation> { - public GenericJavaNullAttributeMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaNullAttributeMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToManyMapping.java index f69d74fd8b..77b37b42a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToManyMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToManyMapping; public class GenericJavaOneToManyMapping extends AbstractJavaOneToManyMapping { - public GenericJavaOneToManyMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaOneToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToOneMapping.java index a20d840ec2..0edb6cacef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOneToOneMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMapping; public class GenericJavaOneToOneMapping extends AbstractJavaOneToOneMapping { - public GenericJavaOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java index 1bda4c8a85..de1ea95467 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOrderable.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel; import org.eclipse.jpt.jpa.core.internal.jpa2.context.OrderColumnValidator; @@ -386,7 +386,7 @@ public class GenericJavaOrderable return this.parent; } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return this.getAttributeMapping().getPersistentAttribute(); } @@ -487,7 +487,7 @@ public class GenericJavaOrderable return new OrderColumnValidator(this.getPersistentAttribute(), (SpecifiedOrderColumn2_0) column); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return GenericJavaOrderable.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java index e59d42bcf0..3f496ed5c0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPersistentAttribute.java @@ -14,13 +14,13 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentAttribute; /** * Generic Java persistent attribute */ public class GenericJavaPersistentAttribute - extends AbstractJavaModifiablePersistentAttribute + extends AbstractJavaPersistentAttribute { public GenericJavaPersistentAttribute(PersistentType parent, JavaResourceField resourceField) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTransientMapping.java index 93861456c7..831e28778b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTransientMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaTransientMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; @@ -23,7 +23,7 @@ public class GenericJavaTransientMapping extends AbstractJavaAttributeMapping<TransientAnnotation> implements JavaTransientMapping { - public GenericJavaTransientMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaTransientMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVersionMapping.java index fe5fe07775..3e3251da11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVersionMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVersionMapping; public class GenericJavaVersionMapping extends AbstractJavaVersionMapping { - public GenericJavaVersionMapping(JavaModifiablePersistentAttribute parent) { + public GenericJavaVersionMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java index 6d64fc9796..8ff4562665 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBaseEmbeddedMapping; import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; @@ -41,7 +41,7 @@ public abstract class AbstractOrmEmbeddedIdMapping<X extends XmlEmbeddedId> protected boolean derived; - protected AbstractOrmEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java index c3cbc17203..252f8e51fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -62,7 +62,7 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded> protected final OrmAssociationOverrideContainer associationOverrideContainer; - protected AbstractOrmEmbeddedMapping(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.associationOverrideContainer = this.buildAssociationOverrideContainer(); } @@ -307,7 +307,7 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded> return new AssociationOverrideJoinTableValidator(this.getPersistentAttribute(), override, (ReadOnlyJoinTable) table); } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmEmbeddedMapping.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBasicMapping.java index 908036d7f1..802f769fb2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBasicMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBasicMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlBasic; @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlBasic; public class GenericOrmBasicMapping extends AbstractOrmBasicMapping<XmlBasic> { - public GenericOrmBasicMapping(OrmModifiablePersistentAttribute parent, XmlBasic xmlMapping) { + public GenericOrmBasicMapping(OrmSpecifiedPersistentAttribute parent, XmlBasic xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java index a4f85902f0..2c68499376 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedIdMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId; /** @@ -19,7 +19,7 @@ public class GenericOrmEmbeddedIdMapping extends AbstractOrmEmbeddedIdMapping<XmlEmbeddedId> { - public GenericOrmEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, XmlEmbeddedId xmlMapping) { + public GenericOrmEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbeddedId xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java index d05883e93e..2d24bf8179 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEmbeddedMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded; /** @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded; public class GenericOrmEmbeddedMapping extends AbstractOrmEmbeddedMapping<XmlEmbedded> { - public GenericOrmEmbeddedMapping(OrmModifiablePersistentAttribute parent, XmlEmbedded xmlMapping) { + public GenericOrmEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbedded xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmIdMapping.java index 86a3734f8b..7707371a55 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmIdMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmIdMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlId; @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlId; public class GenericOrmIdMapping extends AbstractOrmIdMapping<XmlId> { - public GenericOrmIdMapping(OrmModifiablePersistentAttribute parent, XmlId xmlMapping) { + public GenericOrmIdMapping(OrmSpecifiedPersistentAttribute parent, XmlId xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index d4b2d58741..b052a412fa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterabl import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.NamedColumn; @@ -282,7 +282,7 @@ public class GenericOrmJoinTable return this.getRelationshipStrategy().getRelationship().getMapping(); } - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getRelationshipMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToManyMapping.java index d0e6ac516a..4fcd869aa0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToManyMapping.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToManyMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany; public class GenericOrmManyToManyMapping extends AbstractOrmManyToManyMapping<XmlManyToMany> { - public GenericOrmManyToManyMapping(OrmModifiablePersistentAttribute parent, XmlManyToMany xmlMapping) { + public GenericOrmManyToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToMany xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToOneMapping.java index b05779d1b5..3337d51283 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmManyToOneMapping.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToOneMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne; public class GenericOrmManyToOneMapping extends AbstractOrmManyToOneMapping<XmlManyToOne> { - public GenericOrmManyToOneMapping(OrmModifiablePersistentAttribute parent, XmlManyToOne xmlMapping) { + public GenericOrmManyToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToOne xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNullAttributeMapping.java index 465698e1bf..4726482631 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNullAttributeMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; @@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping; public class GenericOrmNullAttributeMapping extends AbstractOrmAttributeMapping<XmlNullAttributeMapping> { - public GenericOrmNullAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping xmlMapping) { + public GenericOrmNullAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToManyMapping.java index bab4d764e1..58087b8c57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToManyMapping.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToManyMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; public class GenericOrmOneToManyMapping extends AbstractOrmOneToManyMapping<XmlOneToMany> { - public GenericOrmOneToManyMapping(OrmModifiablePersistentAttribute parent, XmlOneToMany xmlMapping) { + public GenericOrmOneToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToMany xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToOneMapping.java index 676781a360..b3f1a61702 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOneToOneMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToOneMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; public class GenericOrmOneToOneMapping extends AbstractOrmOneToOneMapping<XmlOneToOne> { - public GenericOrmOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlOneToOne xmlMapping) { + public GenericOrmOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToOne xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java index c84c96979a..708209fa0d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOrderable.java @@ -13,7 +13,7 @@ import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel; import org.eclipse.jpt.jpa.core.internal.jpa2.context.OrderColumnValidator; @@ -373,7 +373,7 @@ public class GenericOrmOrderable return this.parent; } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return this.getAttributeMapping().getPersistentAttribute(); } @@ -465,7 +465,7 @@ public class GenericOrmOrderable GenericOrmOrderable.this.removeXmlOrderColumn(); } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return GenericOrmOrderable.this.getPersistentAttribute(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java index 2c5e3c9b44..3d62b503d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPersistentAttribute.java @@ -13,7 +13,7 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.validation.JptJpaCoreValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -23,7 +23,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * <code>orm.xml</code> persistent attribute */ public class GenericOrmPersistentAttribute - extends AbstractOrmModifiablePersistentAttribute + extends AbstractOrmPersistentAttribute { public GenericOrmPersistentAttribute(OrmPersistentType parent, XmlAttributeMapping xmlMapping) { super(parent, xmlMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTransientMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTransientMapping.java index 07f039e390..482dfd162f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTransientMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; @@ -25,7 +25,7 @@ public class GenericOrmTransientMapping extends AbstractOrmAttributeMapping<XmlTransient> implements OrmTransientMapping { - public GenericOrmTransientMapping(OrmModifiablePersistentAttribute parent, XmlTransient xmlMapping) { + public GenericOrmTransientMapping(OrmSpecifiedPersistentAttribute parent, XmlTransient xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVersionMapping.java index ca39ebdd53..6c9a64cc9d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVersionMapping.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVersionMapping; import org.eclipse.jpt.jpa.core.resource.orm.XmlVersion; @@ -17,7 +17,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlVersion; public class GenericOrmVersionMapping extends AbstractOrmVersionMapping<XmlVersion> { - public GenericOrmVersionMapping(OrmModifiablePersistentAttribute parent, XmlVersion xmlMapping) { + public GenericOrmVersionMapping(OrmSpecifiedPersistentAttribute parent, XmlVersion xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/UnsupportedOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/UnsupportedOrmAttributeMapping.java index 37e27343a8..38bec4da6e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/UnsupportedOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/UnsupportedOrmAttributeMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlNullAttributeMapping; public class UnsupportedOrmAttributeMapping extends AbstractOrmAttributeMapping<XmlNullAttributeMapping> { - public UnsupportedOrmAttributeMapping(OrmModifiablePersistentAttribute parent, XmlNullAttributeMapping xmlMapping) { + public UnsupportedOrmAttributeMapping(OrmSpecifiedPersistentAttribute parent, XmlNullAttributeMapping xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaFactory2_0.java index a11952203a..48daf0b4bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaFactory2_0.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.jpa.core.internal.AbstractJpaFactory; @@ -119,7 +119,7 @@ public class GenericJpaFactory2_0 return new GenericJavaDerivedIdentity2_0(parent); } - public JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent) { + public JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent) { return new GenericJavaElementCollectionMapping2_0(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 7eea576651..011844e42b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -43,7 +43,7 @@ import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverride; @@ -64,7 +64,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -90,7 +90,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAttributeOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionTable2_0; @@ -169,7 +169,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 protected static final Iterable<JavaConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = IterableTools.iterable(MAP_KEY_CONVERTER_ADAPTER_ARRAY); - protected AbstractJavaElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent) { + protected AbstractJavaElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent) { super(parent); this.specifiedTargetClass = this.buildSpecifiedTargetClass(); this.specifiedFetch = this.buildSpecifiedFetch(); @@ -1407,7 +1407,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -1422,7 +1422,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -1570,7 +1570,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 } protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { if (this.getPersistentAttribute().isVirtual()) { messages.add( @@ -1800,7 +1800,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return AbstractJavaElementCollectionMapping2_0.this.getCollectionTable(); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaElementCollectionMapping2_0.this.getPersistentAttribute(); } } @@ -1967,7 +1967,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return AbstractJavaElementCollectionMapping2_0.this.getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return AbstractJavaElementCollectionMapping2_0.this.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java index 26d4b7da0e..6ed9d5e654 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; @@ -58,7 +58,7 @@ public class GenericJavaCollectionTable2_0 // ********** misc ********** - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getElementCollectionMapping().getPersistentAttribute(); } @@ -146,7 +146,7 @@ public class GenericJavaCollectionTable2_0 //return GenericJavaCollectionTable2_0.this.getParent().getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return GenericJavaCollectionTable2_0.this.getElementCollectionMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0.java index d38309afab..c1082cb3b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; public class GenericJavaElementCollectionMapping2_0 extends AbstractJavaElementCollectionMapping2_0 { - public GenericJavaElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent) { + public GenericJavaElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index afad157bb3..1b3908bf6b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -26,8 +26,8 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel; import org.eclipse.jpt.jpa.core.jpa2.context.MapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; @@ -159,7 +159,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 return this.getDerivedIdentity().getMapping(); } - protected JavaModifiablePersistentAttribute getPersistentAttribute() { + protected JavaSpecifiedPersistentAttribute getPersistentAttribute() { return this.getMapping().getPersistentAttribute(); } @@ -335,7 +335,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } protected IMessage buildMessage(ValidationMessage msg, Object[] args) { - ModifiablePersistentAttribute attribute = this.getPersistentAttribute(); + SpecifiedPersistentAttribute attribute = this.getPersistentAttribute(); String attributeDescription = attribute.isVirtual() ? JptJpaCoreValidationArgumentMessages.VIRTUAL_ATTRIBUTE_DESC : JptJpaCoreValidationArgumentMessages.ATTRIBUTE_DESC; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java index 8ad9a35573..64e4bc6fd5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.JpaFactory2_0; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; @@ -65,7 +65,7 @@ public class JavaElementCollectionMappingDefinition2_0 return ElementCollection2_0Annotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -96,7 +96,7 @@ public class JavaElementCollectionMappingDefinition2_0 }; private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((JpaFactory2_0) factory).buildJavaElementCollectionMapping2_0(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java index e1f45bbda9..58eca1add2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaIdMappingDefinition; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; @@ -52,7 +52,7 @@ public class JavaIdMappingDefinition2_0 * accompanied by a M-1 or 1-1 annotation). */ @Override - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { boolean idSpecified = super.isSpecified(persistentAttribute); return idSpecified && ! this.isDerivedId(persistentAttribute); } @@ -67,16 +67,16 @@ public class JavaIdMappingDefinition2_0 * @Id @Basic @ManyToOne private int foo; * </pre> */ - private boolean isDerivedId(JavaModifiablePersistentAttribute persistentAttribute) { + private boolean isDerivedId(JavaSpecifiedPersistentAttribute persistentAttribute) { return this.attributeHasManyToOneMapping(persistentAttribute) || this.attributeHasOneToOneMapping(persistentAttribute); } - private boolean attributeHasManyToOneMapping(JavaModifiablePersistentAttribute persistentAttribute) { + private boolean attributeHasManyToOneMapping(JavaSpecifiedPersistentAttribute persistentAttribute) { return JavaManyToOneMappingDefinition2_0.instance().isSpecified(persistentAttribute); } - private boolean attributeHasOneToOneMapping(JavaModifiablePersistentAttribute persistentAttribute) { + private boolean attributeHasOneToOneMapping(JavaSpecifiedPersistentAttribute persistentAttribute) { return JavaOneToOneMappingDefinition2_0.instance().isSpecified(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index ab4a315576..95a29122f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -41,7 +41,7 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverride; @@ -54,7 +54,7 @@ import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; @@ -64,7 +64,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmLobConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; @@ -89,7 +89,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.CollectionTable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionTable2_0; @@ -171,7 +171,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen protected static final Iterable<OrmConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = IterableTools.iterable(MAP_KEY_CONVERTER_ADAPTER_ARRAY); - protected AbstractOrmElementCollectionMapping2_0(OrmModifiablePersistentAttribute parent, X xmlMapping) { + protected AbstractOrmElementCollectionMapping2_0(OrmSpecifiedPersistentAttribute parent, X xmlMapping) { super(parent, xmlMapping); this.specifiedTargetClass = xmlMapping.getTargetClass(); this.specifiedFetch = this.buildSpecifiedFetch(); @@ -301,7 +301,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected String buildDefaultTargetClass() { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); return (javaAttribute == null) ? null : javaAttribute.getMultiReferenceTargetTypeName(); } @@ -863,7 +863,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected String buildDefaultMapKeyClass() { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); return (javaAttribute == null) ? null : javaAttribute.getMultiReferenceMapKeyTypeName(); } @@ -1204,7 +1204,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -1223,7 +1223,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -1460,7 +1460,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void validateAttributeType(List<IMessage> messages, IReporter reporter) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && !javaAttribute.getJpaContainerDefinition().isContainer()) { messages.add( this.buildValidationMessage( @@ -1616,7 +1616,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void validateMapKeyClass(List<IMessage> messages) { - JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentAttribute(); if ((javaAttribute != null) && javaAttribute.getJpaContainerDefinition().isMap()) { this.validateMapKeyClass_(messages); } @@ -1842,7 +1842,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getCollectionTable(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmElementCollectionMapping2_0.this.getPersistentAttribute(); } @@ -2043,7 +2043,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getName(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return AbstractOrmElementCollectionMapping2_0.this.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java index 4b7103359f..b8092d79c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.NamedColumn; import org.eclipse.jpt.jpa.core.context.TypeMapping; @@ -72,7 +72,7 @@ public class GenericOrmCollectionTable2_0 // ********** misc ********** - public ModifiablePersistentAttribute getPersistentAttribute() { + public SpecifiedPersistentAttribute getPersistentAttribute() { return this.getElementCollectionMapping().getPersistentAttribute(); } @@ -172,7 +172,7 @@ public class GenericOrmCollectionTable2_0 // return null; } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return GenericOrmCollectionTable2_0.this.getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java index 2ae5715c3d..9c893de745 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection; public class GenericOrmElementCollectionMapping2_0 extends AbstractOrmElementCollectionMapping2_0<XmlElementCollection> { - public GenericOrmElementCollectionMapping2_0(OrmModifiablePersistentAttribute parent, XmlElementCollection resourceMapping) { + public GenericOrmElementCollectionMapping2_0(OrmSpecifiedPersistentAttribute parent, XmlElementCollection resourceMapping) { super(parent, resourceMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java index 027a5634d6..e4ac3758c9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModel; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmDerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMapsIdDerivedIdentityStrategy2_0; @@ -100,7 +100,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 return this.getDerivedIdentity().getMapping(); } - protected OrmModifiablePersistentAttribute getPersistentAttribute() { + protected OrmSpecifiedPersistentAttribute getPersistentAttribute() { return this.getMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java index d301221068..23f0ef51b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrderColumn2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmSpecifiedOrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0; @@ -183,7 +183,7 @@ public class GenericOrmOrderColumn2_0 return this.getOrderable().getParent(); } - protected ModifiablePersistentAttribute getPersistentAttribute() { + protected SpecifiedPersistentAttribute getPersistentAttribute() { return this.getAttributeMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXmlContextModelFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXmlContextModelFactory2_0.java index 8be22cf116..2199f0b449 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXmlContextModelFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXmlContextModelFactory2_0.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmSequenceGenerator; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextModelFactory; @@ -67,7 +67,7 @@ public class GenericOrmXmlContextModelFactory2_0 } public OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0( - OrmModifiablePersistentAttribute parent, XmlElementCollection resourceMapping) { + OrmSpecifiedPersistentAttribute parent, XmlElementCollection resourceMapping) { return new GenericOrmElementCollectionMapping2_0(parent, resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java index e13ec67c89..0e7fb9a4b9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/OrmElementCollectionMapping2_0Definition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmXmlContextModelFactory2_0; @@ -57,7 +57,7 @@ public class OrmElementCollectionMapping2_0Definition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping xmlMapping, OrmXmlContextModelFactory factory) { return ((OrmXmlContextModelFactory2_0) factory).buildOrmElementCollectionMapping2_0(parent, (XmlElementCollection) xmlMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/JpaFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/JpaFactory2_0.java index 9775e21d92..1356ed10f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/JpaFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/JpaFactory2_0.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelSourceType; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; @@ -72,7 +72,7 @@ public interface JpaFactory2_0 JavaDerivedIdentity2_0 buildJavaDerivedIdentity(JavaSingleRelationshipMapping2_0 parent); - JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent); + JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent); Cacheable2_0 buildJavaCacheable(JavaCacheableReference2_0 parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/PersistentAttribute2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/PersistentAttribute2_0.java index ebcd048780..0ba04b26c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/PersistentAttribute2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/PersistentAttribute2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; /** * JPA 2.0 - * Context persistent <em>attribute</em> (field or property). + * context persistent <em>attribute</em> (field or property). * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ModifiablePersistentAttribute2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedPersistentAttribute2_0.java index d88898be5d..b5ac7e7f55 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ModifiablePersistentAttribute2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SpecifiedPersistentAttribute2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; /** * JPA 2.0 - * Context persistent <em>attribute</em> (field or property). + * specified persistent <em>attribute</em> (field or property).S * <p> * Provisional API: This interface is part of an interim API that is still * under development and expected to change significantly before reaching @@ -24,8 +24,8 @@ import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; * @version 2.3 * @since 2.3 */ -public interface ModifiablePersistentAttribute2_0 - extends ModifiablePersistentAttribute, PersistentAttribute2_0 +public interface SpecifiedPersistentAttribute2_0 + extends SpecifiedPersistentAttribute, PersistentAttribute2_0 { // combine various interfaces } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXmlContextModelFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXmlContextModelFactory2_0.java index 0d8076fef6..7ca665e383 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXmlContextModelFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXmlContextModelFactory2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.jpa2.context.orm; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; @@ -39,7 +39,7 @@ public interface OrmXmlContextModelFactory2_0 OrmDerivedIdentity2_0 buildOrmDerivedIdentity(OrmSingleRelationshipMapping2_0 parent); - OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmModifiablePersistentAttribute parent, XmlElementCollection resourceMapping); + OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmSpecifiedPersistentAttribute parent, XmlElementCollection resourceMapping); Cacheable2_0 buildOrmCacheable(OrmCacheableReference2_0 parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java index 52eb519b63..12d2009d4f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java @@ -34,9 +34,9 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.persistence.jpa.jpql.tools.spi.IEntity; @@ -101,7 +101,7 @@ public abstract class JpaMapping implements IMapping { } protected ITypeDeclaration[] buildGenericTypeDeclarations() { - JavaModifiablePersistentAttribute javaPersistentAttribute = mapping.getPersistentAttribute().getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = mapping.getPersistentAttribute().getJavaPersistentAttribute(); JavaResourceAttribute resource = javaPersistentAttribute == null ? null : javaPersistentAttribute.getResourceAttribute(); List<ITypeDeclaration> declarations = ListTools.list(buildGenericTypeDeclarations(resource)); return declarations.toArray(new ITypeDeclaration[declarations.size()]); @@ -124,7 +124,7 @@ public abstract class JpaMapping implements IMapping { protected IType buildType(boolean resolveRelationshipType) { - ModifiablePersistentAttribute property = mapping.getPersistentAttribute(); + SpecifiedPersistentAttribute property = mapping.getPersistentAttribute(); String typeName = property.getTypeName(); // The attribute could be virtual, incorrectly specified in the orm.xml @@ -158,7 +158,7 @@ public abstract class JpaMapping implements IMapping { protected ITypeDeclaration buildTypeDeclaration() { - ModifiablePersistentAttribute property = mapping.getPersistentAttribute(); + SpecifiedPersistentAttribute property = mapping.getPersistentAttribute(); String typeName = property.getTypeName(); // The attribute could be virtual, incorrectly specified in the orm.xml diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java index 84d372b3e7..2b83738fd3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.context.orm; import org.eclipse.jpt.common.utility.predicate.Predicate; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkModifiableAccessMethodsContainer; @@ -57,7 +57,7 @@ public interface EclipseLinkOrmPersistentType * @see OrmAttributeMappingDefinition#isSingleRelationshipMapping() * @see OrmAttributeMappingDefinition#isCollectionMapping() */ - OrmModifiablePersistentAttribute addVirtualAttribute(String attributeName, String mappingKey, String attributeType, String targetType); + OrmSpecifiedPersistentAttribute addVirtualAttribute(String attributeName, String mappingKey, String attributeType, String targetType); //*************** covariant overrides ***************** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaFactory.java index b11dceb63a..1a5d62f271 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLink2_0JpaFactory.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaAssociationOverrideContainer; @@ -109,7 +109,7 @@ public class EclipseLink2_0JpaFactory return new GenericJavaDerivedIdentity2_0(parent); } - public JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent) { + public JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkElementCollectionMapping2_0(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java index 58fe83bf73..50e5cca0a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/EclipseLinkJpaFactory.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; import org.eclipse.jpt.jpa.core.internal.AbstractJpaFactory; @@ -66,22 +66,22 @@ public class EclipseLinkJpaFactory // ********** Java Context Model overrides ********** @Override - public JavaModifiablePersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentAttribute(PersistentType parent, Accessor accessor) { return new EclipseLinkSpecifiedJavaPersistentAttribute(parent, accessor); } @Override - public JavaModifiablePersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentField(PersistentType parent, JavaResourceField resourceField) { return new EclipseLinkSpecifiedJavaPersistentAttribute(parent, resourceField); } @Override - public JavaModifiablePersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { + public JavaSpecifiedPersistentAttribute buildJavaPersistentProperty(PersistentType parent, JavaResourceMethod resourceGetter, JavaResourceMethod resourceSetter) { return new EclipseLinkSpecifiedJavaPersistentAttribute(parent, resourceGetter, resourceSetter); } @Override - public JavaBasicMapping buildJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + public JavaBasicMapping buildJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkBasicMapping(parent); } @@ -96,7 +96,7 @@ public class EclipseLinkJpaFactory } @Override - public JavaIdMapping buildJavaIdMapping(JavaModifiablePersistentAttribute parent) { + public JavaIdMapping buildJavaIdMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkIdMapping(parent); } @@ -106,46 +106,46 @@ public class EclipseLinkJpaFactory } @Override - public JavaVersionMapping buildJavaVersionMapping(JavaModifiablePersistentAttribute parent) { + public JavaVersionMapping buildJavaVersionMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkVersionMapping(parent); } @Override - public JavaOneToManyMapping buildJavaOneToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaOneToManyMapping buildJavaOneToManyMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkOneToManyMapping(parent); } @Override - public JavaOneToOneMapping buildJavaOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaOneToOneMapping buildJavaOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkOneToOneMapping(parent); } @Override - public JavaManyToManyMapping buildJavaManyToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaManyToManyMapping buildJavaManyToManyMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkManyToManyMapping(parent); } @Override - public JavaManyToOneMapping buildJavaManyToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaManyToOneMapping buildJavaManyToOneMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkManyToOneMapping(parent); } // ********** EclipseLink-specific Java Context Model ********** - public JavaEclipseLinkBasicCollectionMapping buildJavaEclipseLinkBasicCollectionMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkBasicCollectionMapping buildJavaEclipseLinkBasicCollectionMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkBasicCollectionMapping(parent); } - public JavaEclipseLinkBasicMapMapping buildJavaEclipseLinkBasicMapMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkBasicMapMapping buildJavaEclipseLinkBasicMapMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkBasicMapMapping(parent); } - public JavaEclipseLinkTransformationMapping buildJavaEclipseLinkTransformationMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkTransformationMapping buildJavaEclipseLinkTransformationMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkTransformationMapping(parent); } - public JavaEclipseLinkVariableOneToOneMapping buildJavaEclipseLinkVariableOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkVariableOneToOneMapping buildJavaEclipseLinkVariableOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaEclipseLinkVariableOneToOneMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMappingDefinition2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMappingDefinition2_3.java index a80fced7fc..892da76527 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMappingDefinition2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaArrayMappingDefinition2_3.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkArrayAnnotation2_3; @@ -52,7 +52,7 @@ public class EclipseLinkJavaArrayMappingDefinition2_3 return EclipseLinkArrayAnnotation2_3.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -69,7 +69,7 @@ public class EclipseLinkJavaArrayMappingDefinition2_3 }; private static final Iterable<String> ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES = IterableTools.iterable(ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES_ARRAY); - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return new JavaEclipseLinkArrayMapping2_3(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java index 4d909e4747..e418456ad4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicCollectionMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation; @@ -47,7 +47,7 @@ public class EclipseLinkJavaBasicCollectionMappingDefinition return EclipseLinkBasicCollectionAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -55,7 +55,7 @@ public class EclipseLinkJavaBasicCollectionMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkBasicCollectionMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java index d85a1007d5..d56f451383 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMapMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation; @@ -47,7 +47,7 @@ public class EclipseLinkJavaBasicMapMappingDefinition return EclipseLinkBasicMapAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -55,7 +55,7 @@ public class EclipseLinkJavaBasicMapMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkBasicMapMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java index b4e4e6b743..eac93290ff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaBasicMappingDefinition2_0; @@ -56,7 +56,7 @@ public class EclipseLinkJavaBasicMappingDefinition2_0 EclipseLinkJavaBasicMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return EclipseLinkJavaBasicMappingDefinition.instance().isDefault(persistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_2.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_2.java index b6ba2336dc..47b59c2eae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_2.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaBasicMappingDefinition2_2.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; @@ -65,7 +65,7 @@ public class EclipseLinkJavaBasicMappingDefinition2_2 ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return DELEGATE.isDefault(persistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition2_0.java index d3e897cc41..91b5bf3835 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaIdMappingDefinition2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaIdMappingDefinition2_0; @@ -50,7 +50,7 @@ public class EclipseLinkJavaIdMappingDefinition2_0 * <code>Id</code> mapping. */ @Override - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { boolean specSpecified = super.isSpecified(persistentAttribute); return specSpecified && ! this.isDefaultDerivedId(persistentAttribute); } @@ -58,7 +58,7 @@ public class EclipseLinkJavaIdMappingDefinition2_0 /** * EclipseLink supports default M:1 and 1:1 mappings. */ - private boolean isDefaultDerivedId(JavaModifiablePersistentAttribute persistentAttribute) { + private boolean isDefaultDerivedId(JavaSpecifiedPersistentAttribute persistentAttribute) { String defaultKey = persistentAttribute.getDefaultMappingKey(); return ObjectTools.equals(defaultKey, this.getManyToOneKey()) || ObjectTools.equals(defaultKey, this.getOneToOneKey()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java index 4f69e07ebf..0b3feb5ca9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation; @@ -72,7 +72,7 @@ public class EclipseLinkJavaOneToManyMappingDefinition ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { String targetEntity = persistentAttribute.getMultiReferenceTargetTypeName(); return (targetEntity != null) && (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java index 22911a2677..d930234699 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToManyMappingDefinition2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToManyMappingDefinition2_0; @@ -56,7 +56,7 @@ public class EclipseLinkJavaOneToManyMappingDefinition2_0 EclipseLinkJavaOneToManyMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return EclipseLinkJavaOneToManyMappingDefinition.instance().isDefault(persistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java index 207f08cad1..d009c7e515 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToOneMappingDefinition; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkConverterAnnotation; @@ -72,7 +72,7 @@ public class EclipseLinkJavaOneToOneMappingDefinition ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { String targetEntity = persistentAttribute.getSingleReferenceTargetTypeName(); return (targetEntity != null) && (persistentAttribute.getPersistenceUnit().getEntity(targetEntity) != null); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java index 5a8672b7fc..10ebb8fcbc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaOneToOneMappingDefinition2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaOneToOneMappingDefinition2_0; @@ -56,7 +56,7 @@ public class EclipseLinkJavaOneToOneMappingDefinition2_0 EclipseLinkJavaOneToOneMappingDefinition.ECLIPSE_LINK_SUPPORTING_ANNOTATION_NAMES ); - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return EclipseLinkJavaOneToOneMappingDefinition.instance().isDefault(persistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaStructureMappingDefinition2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaStructureMappingDefinition2_3.java index 7e28a77c30..9c390665b8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaStructureMappingDefinition2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaStructureMappingDefinition2_3.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkStructureAnnotation2_3; @@ -46,7 +46,7 @@ public class EclipseLinkJavaStructureMappingDefinition2_3 return EclipseLinkStructureAnnotation2_3.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -54,7 +54,7 @@ public class EclipseLinkJavaStructureMappingDefinition2_3 return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return new JavaEclipseLinkStructureMapping2_3(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java index 12fb8654d4..a4f7dbac75 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaTransformationMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation; @@ -47,7 +47,7 @@ public class EclipseLinkJavaTransformationMappingDefinition return EclipseLinkTransformationAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -55,7 +55,7 @@ public class EclipseLinkJavaTransformationMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkTransformationMapping(persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java index 949e18dd64..6b99f4ba97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaVariableOneToOneMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaFactory; @@ -48,7 +48,7 @@ public class EclipseLinkJavaVariableOneToOneMappingDefinition return EclipseLinkVariableOneToOneAnnotation.ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -56,11 +56,11 @@ public class EclipseLinkJavaVariableOneToOneMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((EclipseLinkJpaFactory) factory).buildJavaEclipseLinkVariableOneToOneMapping(persistentAttribute); } - public boolean isDefault(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isDefault(JavaSpecifiedPersistentAttribute persistentAttribute) { return ((JavaEclipseLinkPersistentAttribute) persistentAttribute).typeIsValidForVariableOneToOne(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkSpecifiedJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkSpecifiedJavaPersistentAttribute.java index e37630a002..6385172859 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkSpecifiedJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkSpecifiedJavaPersistentAttribute.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkPersistentAttributeValidator; @@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkPersiste * EclipseLink Java persistent attribute */ public class EclipseLinkSpecifiedJavaPersistentAttribute - extends AbstractJavaModifiablePersistentAttribute + extends AbstractJavaPersistentAttribute implements JavaEclipseLinkPersistentAttribute { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java index 82776dcc86..39baf2e42b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkArrayMapping2_3.java @@ -27,14 +27,14 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaColumnMapping; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.NamedColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaConverter; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; @@ -68,7 +68,7 @@ public class JavaEclipseLinkArrayMapping2_3 protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkArrayMapping2_3(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkArrayMapping2_3(JavaSpecifiedPersistentAttribute parent) { super(parent); this.column = this.buildColumn(); this.converter = this.buildConverter(); @@ -239,7 +239,7 @@ public class JavaEclipseLinkArrayMapping2_3 // ********** metamodel ********** @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java index 467a1080fe..4f5ce33660 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; @@ -28,7 +28,7 @@ public class JavaEclipseLinkBasicCollectionMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkBasicCollectionMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkBasicCollectionMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } @@ -75,7 +75,7 @@ public class JavaEclipseLinkBasicCollectionMapping // ********** metamodel ********** @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java index 7839e8070f..1010dce123 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java @@ -13,10 +13,10 @@ import java.util.ArrayList; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; @@ -30,7 +30,7 @@ public class JavaEclipseLinkBasicMapMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkBasicMapMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkBasicMapMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } @@ -90,7 +90,7 @@ public class JavaEclipseLinkBasicMapMapping // ********** metamodel ********** @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java index 889c187961..c460054529 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValue; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValueMapping; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMapping; import org.eclipse.jpt.jpa.core.resource.java.GeneratedValueAnnotation; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; @@ -46,7 +46,7 @@ public class JavaEclipseLinkBasicMapping protected JavaGeneratedValue generatedValue; - public JavaEclipseLinkBasicMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkBasicMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.mutable = new JavaEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java index 099e9f8fd6..00661bb05f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkElementCollectionMapping2_0.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextModel; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.AbstractJavaElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; @@ -32,7 +32,7 @@ public class JavaEclipseLinkElementCollectionMapping2_0 protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkElementCollectionMapping2_0(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkElementCollectionMapping2_0(JavaSpecifiedPersistentAttribute parent) { super(parent); this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedIdMapping.java index 3840b955e6..c401335f7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedIdMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEmbeddedIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; @@ -26,7 +26,7 @@ public class JavaEclipseLinkEmbeddedIdMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkEmbeddedIdMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkEmbeddedIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedMapping.java index d0dcb5cbab..e5106540c7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkEmbeddedMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEmbeddedMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; @@ -23,7 +23,7 @@ public class JavaEclipseLinkEmbeddedMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkEmbeddedMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkEmbeddedMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java index 13b77db361..d74d6536bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextModel; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable; @@ -34,7 +34,7 @@ public class JavaEclipseLinkIdMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkIdMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkIdMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.mutable = new JavaEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java index 6d335b4fc0..090394c34c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java @@ -13,7 +13,7 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; @@ -31,7 +31,7 @@ public class JavaEclipseLinkManyToManyMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkManyToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkManyToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java index 58b89a51ab..be41276546 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToOneMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; @@ -30,7 +30,7 @@ public class JavaEclipseLinkManyToOneMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkManyToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkManyToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java index 0754aed944..47c49b1ff0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java @@ -13,7 +13,7 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToManyMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping2_0; @@ -35,7 +35,7 @@ public class JavaEclipseLinkOneToManyMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkOneToManyMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkOneToManyMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.privateOwned = new JavaEclipseLinkPrivateOwned(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java index 6eb7ef5a50..ea589dd780 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaOneToOneMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; @@ -33,7 +33,7 @@ public class JavaEclipseLinkOneToOneMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.privateOwned = new JavaEclipseLinkPrivateOwned(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructureMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructureMapping2_3.java index 7c26dca6a3..eb2cf0189e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructureMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkStructureMapping2_3.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2_3; @@ -20,7 +20,7 @@ public class JavaEclipseLinkStructureMapping2_3 implements EclipseLinkStructureMapping2_3 { - public JavaEclipseLinkStructureMapping2_3(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkStructureMapping2_3(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java index 733c6747e4..c7d9cd989c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; @@ -26,7 +26,7 @@ public class JavaEclipseLinkTransformationMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkTransformationMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkTransformationMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java index ce91863ccf..c954a82a95 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.jpa.core.context.JpaContextModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; @@ -26,7 +26,7 @@ public class JavaEclipseLinkVariableOneToOneMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkVariableOneToOneMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkVariableOneToOneMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.converterContainer = this.buildConverterContainer(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java index d61c88227e..59bae86d51 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.JpaContextModel; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVersionMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; @@ -34,7 +34,7 @@ public class JavaEclipseLinkVersionMapping protected final JavaEclipseLinkConverterContainer converterContainer; - public JavaEclipseLinkVersionMapping(JavaModifiablePersistentAttribute parent) { + public JavaEclipseLinkVersionMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); this.mutable = new JavaEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java index 1182490441..739cb7f761 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicCollectionMapping.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; @@ -25,7 +25,7 @@ public abstract class AbstractOrmEclipseLinkBasicCollectionMapping extends AbstractOrmAttributeMapping<XmlBasicCollection> implements EclipseLinkBasicCollectionMapping { - protected AbstractOrmEclipseLinkBasicCollectionMapping(OrmModifiablePersistentAttribute parent, XmlBasicCollection xmlMapping) { + protected AbstractOrmEclipseLinkBasicCollectionMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicCollection xmlMapping) { super(parent, xmlMapping); } @@ -53,13 +53,13 @@ public abstract class AbstractOrmEclipseLinkBasicCollectionMapping // ********** metamodel ********** @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override public String getMetamodelTypeName() { String targetTypeName = null; - JavaModifiablePersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute(); if (javaPersistentAttribute != null) { if(((PersistentType2_0)javaPersistentAttribute).getMetamodelType() == null) { // dynamic type return null; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java index 560f1b6c51..9e456060a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/AbstractOrmEclipseLinkBasicMapMapping.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import java.util.ArrayList; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; @@ -26,7 +26,7 @@ public abstract class AbstractOrmEclipseLinkBasicMapMapping extends AbstractOrmAttributeMapping<XmlBasicMap> implements EclipseLinkBasicMapMapping { - protected AbstractOrmEclipseLinkBasicMapMapping(OrmModifiablePersistentAttribute parent, XmlBasicMap xmlMapping) { + protected AbstractOrmEclipseLinkBasicMapMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicMap xmlMapping) { super(parent, xmlMapping); } @@ -55,13 +55,13 @@ public abstract class AbstractOrmEclipseLinkBasicMapMapping // ********** metamodel ********** @Override protected String getMetamodelFieldTypeName() { - return ((ModifiablePersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((SpecifiedPersistentAttribute2_0) getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override public String getMetamodelTypeName() { String targetTypeName = null; - JavaModifiablePersistentAttribute javaPersistentAttribute = this.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = this.getJavaPersistentAttribute(); if (javaPersistentAttribute != null) { if(((PersistentType2_0)javaPersistentAttribute).getMetamodelType() == null) { // dynamic type return null; @@ -79,7 +79,7 @@ public abstract class AbstractOrmEclipseLinkBasicMapMapping protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { String mapKeyTypeName = null; - JavaModifiablePersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = getJavaPersistentAttribute(); if (javaPersistentAttribute != null) { mapKeyTypeName = javaPersistentAttribute.getMultiReferenceMapKeyTypeName(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java index 8e51b8b4e6..227fbe3601 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.AbstractOrmElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -46,7 +46,7 @@ public class EclipseLinkOrmElementCollectionMapping2_0 protected final OrmEclipseLinkConverterContainer converterContainer; - public EclipseLinkOrmElementCollectionMapping2_0(OrmModifiablePersistentAttribute parent, XmlElementCollection resourceMapping) { + public EclipseLinkOrmElementCollectionMapping2_0(OrmSpecifiedPersistentAttribute parent, XmlElementCollection resourceMapping) { super(parent, resourceMapping); this.joinFetch = new OrmEclipseLinkJoinFetch(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java index 18a7a6106d..5805cd408d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentAttribute.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkModifiableAccessMethodsContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.EclipseLinkPersistentAttributeValidator; @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping; * <code>orm.xml</code> persistent attribute */ public class EclipseLinkOrmPersistentAttribute - extends AbstractOrmModifiablePersistentAttribute + extends AbstractOrmPersistentAttribute implements EclipseLinkModifiableAccessMethodsContainer { //TODO defaults from the persistentType if the access is VIRTUAL @@ -117,7 +117,7 @@ public class EclipseLinkOrmPersistentAttribute @Override - protected JavaModifiablePersistentAttribute getCachedJavaAttribute() { + protected JavaSpecifiedPersistentAttribute getCachedJavaAttribute() { if (this.getAccess() == EclipseLinkAccessType.VIRTUAL) { //if VIRTUAL we will always have to build and cache the 'javaAttribute' //we clear out the cached 'javaAttribute in setSpecifiedAccess_() and setDefaultAccess_() diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java index 175d947cb5..5d9379e7fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmPersistentTypeImpl.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaManagedType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.SpecifiedOrmPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; @@ -146,7 +146,7 @@ public class EclipseLinkOrmPersistentTypeImpl return super.getOverriddenPersistentType(); } - public OrmModifiablePersistentAttribute addVirtualAttribute(String attributeName, String mappingKey, String attributeType, String targetType) { + public OrmSpecifiedPersistentAttribute addVirtualAttribute(String attributeName, String mappingKey, String attributeType, String targetType) { // force the creation of an empty xml attribute container beforehand or it will trigger // a sync and, if we do this after adding the attribute, clear out our context attributes Attributes xmlAttributes = this.getXmlAttributesForUpdate(); @@ -160,7 +160,7 @@ public class EclipseLinkOrmPersistentTypeImpl xmlMapping.setAccess(EclipseLinkAccessType.VIRTUAL.getOrmAccessType()); } - OrmModifiablePersistentAttribute specifiedAttribute = this.buildSpecifiedAttribute(xmlMapping); + OrmSpecifiedPersistentAttribute specifiedAttribute = this.buildSpecifiedAttribute(xmlMapping); // we need to add the attribute to the right spot in the list - stupid spec... int specifiedIndex = this.getSpecifiedAttributeInsertionIndex(specifiedAttribute); this.addItemToList(specifiedIndex, specifiedAttribute, this.specifiedAttributes, SPECIFIED_ATTRIBUTES_LIST); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory.java index 6654e5f7a5..0b94051e45 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitDefaults; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXml; @@ -60,7 +60,7 @@ public class EclipseLinkOrmXmlContextModelFactory } @Override - public OrmModifiablePersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping resourceMapping) { + public OrmSpecifiedPersistentAttribute buildOrmPersistentAttribute(OrmPersistentType parent, org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping resourceMapping) { return new EclipseLinkOrmPersistentAttribute(parent, (XmlAttributeMapping) resourceMapping); } @@ -85,63 +85,63 @@ public class EclipseLinkOrmXmlContextModelFactory } @Override - public OrmBasicMapping buildOrmBasicMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlBasic resourceMapping) { + public OrmBasicMapping buildOrmBasicMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlBasic resourceMapping) { return new OrmEclipseLinkBasicMapping(parent, (XmlBasic) resourceMapping); } @Override - public OrmIdMapping buildOrmIdMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlId resourceMapping) { + public OrmIdMapping buildOrmIdMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlId resourceMapping) { return new OrmEclipseLinkIdMapping(parent, (XmlId) resourceMapping); } @Override - public OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded resourceMapping) { + public OrmEmbeddedMapping buildOrmEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlEmbedded resourceMapping) { return new OrmEclipseLinkEmbeddedMapping(parent, (XmlEmbedded) resourceMapping); } @Override - public OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId resourceMapping) { + public OrmEmbeddedIdMapping buildOrmEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddedId resourceMapping) { return new OrmEclipseLinkEmbeddedIdMapping(parent, (XmlEmbeddedId) resourceMapping); } @Override - public OrmManyToManyMapping buildOrmManyToManyMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany resourceMapping) { + public OrmManyToManyMapping buildOrmManyToManyMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany resourceMapping) { return new OrmEclipseLinkManyToManyMapping(parent, (XmlManyToMany) resourceMapping); } @Override - public OrmManyToOneMapping buildOrmManyToOneMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne resourceMapping) { + public OrmManyToOneMapping buildOrmManyToOneMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne resourceMapping) { return new OrmEclipseLinkManyToOneMapping(parent, (XmlManyToOne) resourceMapping); } @Override - public OrmOneToManyMapping buildOrmOneToManyMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany resourceMapping) { + public OrmOneToManyMapping buildOrmOneToManyMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany resourceMapping) { return new OrmEclipseLinkOneToManyMapping(parent, (XmlOneToMany) resourceMapping); } @Override - public OrmOneToOneMapping buildOrmOneToOneMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne resourceMapping) { + public OrmOneToOneMapping buildOrmOneToOneMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne resourceMapping) { return new OrmEclipseLinkOneToOneMapping(parent, (XmlOneToOne) resourceMapping); } @Override - public OrmVersionMapping buildOrmVersionMapping(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlVersion resourceMapping) { + public OrmVersionMapping buildOrmVersionMapping(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlVersion resourceMapping) { return new OrmEclipseLinkVersionMapping(parent, (XmlVersion) resourceMapping); } - public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmModifiablePersistentAttribute parent, XmlBasicCollection resourceMapping) { + public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicCollection resourceMapping) { return new OrmEclipseLinkBasicCollectionMapping(parent, resourceMapping); } - public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmModifiablePersistentAttribute parent, XmlBasicMap resourceMapping) { + public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicMap resourceMapping) { return new OrmEclipseLinkBasicMapMapping(parent, resourceMapping); } - public OrmEclipseLinkTransformationMapping buildOrmEclipseLinkTransformationMapping(OrmModifiablePersistentAttribute parent, XmlTransformation resourceMapping) { + public OrmEclipseLinkTransformationMapping buildOrmEclipseLinkTransformationMapping(OrmSpecifiedPersistentAttribute parent, XmlTransformation resourceMapping) { return new OrmEclipseLinkTransformationMapping(parent, resourceMapping); } - public OrmEclipseLinkVariableOneToOneMapping buildOrmEclipseLinkVariableOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlVariableOneToOne resourceMapping) { + public OrmEclipseLinkVariableOneToOneMapping buildOrmEclipseLinkVariableOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlVariableOneToOne resourceMapping) { return new OrmEclipseLinkVariableOneToOneMapping(parent, resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_0.java index 604f6484c4..4be97b94ac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_0.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmSequenceGenerator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmOrderable; @@ -58,7 +58,7 @@ public class EclipseLinkOrmXmlContextModelFactory2_0 return new GenericOrmDerivedIdentity2_0(parent); } - public OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmModifiablePersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection resourceMapping) { + public OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmSpecifiedPersistentAttribute parent, org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection resourceMapping) { return new EclipseLinkOrmElementCollectionMapping2_0(parent, (XmlElementCollection) resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_1.java index 9fafe93560..b659aa2e0c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_1.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap; @@ -18,12 +18,12 @@ public class EclipseLinkOrmXmlContextModelFactory2_1 { @Override - public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmModifiablePersistentAttribute parent, XmlBasicCollection resourceMapping) { + public AbstractOrmEclipseLinkBasicCollectionMapping buildOrmEclipseLinkBasicCollectionMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicCollection resourceMapping) { return new OrmEclipseLinkBasicCollectionMapping2_1(parent, resourceMapping); } @Override - public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmModifiablePersistentAttribute parent, XmlBasicMap resourceMapping) { + public AbstractOrmEclipseLinkBasicMapMapping buildOrmEclipseLinkBasicMapMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicMap resourceMapping) { return new OrmEclipseLinkBasicMapMapping2_1(parent, resourceMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_3.java index 44bfb484ba..5871b29b16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmXmlContextModelFactory2_3.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlArray; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlStructure; @@ -17,11 +17,11 @@ public class EclipseLinkOrmXmlContextModelFactory2_3 extends EclipseLinkOrmXmlContextModelFactory2_0 { - public OrmEclipseLinkArrayMapping2_3 buildOrmEclipseLinkArrayMapping(OrmModifiablePersistentAttribute parent, XmlArray resourceMapping) { + public OrmEclipseLinkArrayMapping2_3 buildOrmEclipseLinkArrayMapping(OrmSpecifiedPersistentAttribute parent, XmlArray resourceMapping) { return new OrmEclipseLinkArrayMapping2_3(parent, resourceMapping); } - public OrmEclipseLinkStructureMapping2_3 buildOrmEclipseLinkStructureMapping(OrmModifiablePersistentAttribute parent, XmlStructure resourceMapping) { + public OrmEclipseLinkStructureMapping2_3 buildOrmEclipseLinkStructureMapping(OrmSpecifiedPersistentAttribute parent, XmlStructure resourceMapping) { return new OrmEclipseLinkStructureMapping2_3(parent, resourceMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java index bd119e28d1..f003241e92 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkVirtualJavaPersistentAttribute.java @@ -28,13 +28,13 @@ import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.ModifiablePersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.SpecifiedPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.internal.plugin.JptJpaEclipseLinkCorePlugin; @@ -42,7 +42,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlAttributeMapping; public class EclipseLinkVirtualJavaPersistentAttribute extends AbstractJavaContextModel<OrmPersistentType> - implements JavaModifiablePersistentAttribute, ModifiablePersistentAttribute2_0, JavaEclipseLinkPersistentAttribute + implements JavaSpecifiedPersistentAttribute, SpecifiedPersistentAttribute2_0, JavaEclipseLinkPersistentAttribute { private final XmlAttributeMapping xmlAttributeMapping; @@ -136,7 +136,7 @@ public class EclipseLinkVirtualJavaPersistentAttribute throw new UnsupportedOperationException(); } - public JavaModifiablePersistentAttribute getJavaPersistentAttribute() { + public JavaSpecifiedPersistentAttribute getJavaPersistentAttribute() { return this; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java index e4893cc9ab..7dc2d6ba99 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmColumnMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmLobConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -72,7 +72,7 @@ public class OrmEclipseLinkArrayMapping2_3 protected final OrmEclipseLinkConverterContainer converterContainer; - public OrmEclipseLinkArrayMapping2_3(OrmModifiablePersistentAttribute parent, XmlArray xmlMapping) { + public OrmEclipseLinkArrayMapping2_3(OrmSpecifiedPersistentAttribute parent, XmlArray xmlMapping) { super(parent, xmlMapping); this.column = this.buildColumn(); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java index 9e7332901c..b08858aa5f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3Definition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkArrayMapping2_3Definition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return new OrmEclipseLinkArrayMapping2_3(parent, (XmlArray) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java index a02018ab2f..48e1d1bf8d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection; public class OrmEclipseLinkBasicCollectionMapping extends AbstractOrmEclipseLinkBasicCollectionMapping { - public OrmEclipseLinkBasicCollectionMapping(OrmModifiablePersistentAttribute parent, XmlBasicCollection xmlMapping) { + public OrmEclipseLinkBasicCollectionMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicCollection xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java index d707b1d359..b289da1f76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMapping2_1.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicCollection; import org.eclipse.jpt.jpa.eclipselink.core.validation.JptJpaEclipseLinkCoreValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -19,7 +19,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class OrmEclipseLinkBasicCollectionMapping2_1 extends AbstractOrmEclipseLinkBasicCollectionMapping { - public OrmEclipseLinkBasicCollectionMapping2_1(OrmModifiablePersistentAttribute parent, XmlBasicCollection xmlMapping) { + public OrmEclipseLinkBasicCollectionMapping2_1(OrmSpecifiedPersistentAttribute parent, XmlBasicCollection xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java index 90f1ecd56d..0882d495ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicCollectionMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkBasicCollectionMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return ((EclipseLinkOrmXmlContextModelFactory) factory). diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java index 59948e3b60..4ef0764d7a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap; public class OrmEclipseLinkBasicMapMapping extends AbstractOrmEclipseLinkBasicMapMapping { - public OrmEclipseLinkBasicMapMapping(OrmModifiablePersistentAttribute parent, XmlBasicMap xmlMapping) { + public OrmEclipseLinkBasicMapMapping(OrmSpecifiedPersistentAttribute parent, XmlBasicMap xmlMapping) { super(parent, xmlMapping); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping2_1.java index 92d425ee60..cbacf71451 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMapping2_1.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlBasicMap; import org.eclipse.jpt.jpa.eclipselink.core.validation.JptJpaEclipseLinkCoreValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -19,7 +19,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class OrmEclipseLinkBasicMapMapping2_1 extends AbstractOrmEclipseLinkBasicMapMapping { - public OrmEclipseLinkBasicMapMapping2_1(OrmModifiablePersistentAttribute parent, XmlBasicMap xmlMapping) { + public OrmEclipseLinkBasicMapMapping2_1(OrmSpecifiedPersistentAttribute parent, XmlBasicMap xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java index 09bc7acd5a..23d1b0118d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkBasicMapMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return ((EclipseLinkOrmXmlContextModelFactory) factory). diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java index e82f992141..e1fcfd35ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratedValue; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratedValueMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratorContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmBasicMapping; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -53,7 +53,7 @@ public class OrmEclipseLinkBasicMapping protected OrmGeneratedValue generatedValue;//supported in EL 1.1 and higher - public OrmEclipseLinkBasicMapping(OrmModifiablePersistentAttribute parent, XmlBasic xmlMapping) { + public OrmEclipseLinkBasicMapping(OrmSpecifiedPersistentAttribute parent, XmlBasic xmlMapping) { super(parent, xmlMapping); this.mutable = new OrmEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedIdMapping.java index 2e33186544..3f2f0a0dc6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedIdMapping.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmEmbeddedIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -31,7 +31,7 @@ public class OrmEclipseLinkEmbeddedIdMapping extends AbstractOrmEmbeddedIdMapping<XmlEmbeddedId> { - public OrmEclipseLinkEmbeddedIdMapping(OrmModifiablePersistentAttribute parent, XmlEmbeddedId xmlMapping) { + public OrmEclipseLinkEmbeddedIdMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbeddedId xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedMapping.java index 6f14391fe0..5033c888a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkEmbeddedMapping.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.AbstractOrmEmbeddedMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -30,7 +30,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; public class OrmEclipseLinkEmbeddedMapping extends AbstractOrmEmbeddedMapping<XmlEmbedded> { - public OrmEclipseLinkEmbeddedMapping(OrmModifiablePersistentAttribute parent, XmlEmbedded xmlMapping) { + public OrmEclipseLinkEmbeddedMapping(OrmSpecifiedPersistentAttribute parent, XmlEmbedded xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java index d581c84eb7..981c005481 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -43,7 +43,7 @@ public class OrmEclipseLinkIdMapping protected final OrmEclipseLinkConverterContainer converterContainer; - public OrmEclipseLinkIdMapping(OrmModifiablePersistentAttribute parent, XmlId xmlMapping) { + public OrmEclipseLinkIdMapping(OrmSpecifiedPersistentAttribute parent, XmlId xmlMapping) { super(parent, xmlMapping); this.mutable = new OrmEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java index 1f0fd428d5..0b78f9a3a1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -43,7 +43,7 @@ public class OrmEclipseLinkManyToManyMapping protected final OrmEclipseLinkConverterContainer converterContainer; - public OrmEclipseLinkManyToManyMapping(OrmModifiablePersistentAttribute parent, XmlManyToMany xmlMapping) { + public OrmEclipseLinkManyToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToMany xmlMapping) { super(parent, xmlMapping); this.joinFetch = new OrmEclipseLinkJoinFetch(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java index ab04a98a55..38e9214bb1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToOneMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToOneMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; @@ -27,7 +27,7 @@ public class OrmEclipseLinkManyToOneMapping protected final OrmEclipseLinkJoinFetch joinFetch; - protected OrmEclipseLinkManyToOneMapping(OrmModifiablePersistentAttribute parent, XmlManyToOne xmlMapping) { + protected OrmEclipseLinkManyToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlManyToOne xmlMapping) { super(parent, xmlMapping); this.joinFetch = new OrmEclipseLinkJoinFetch(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java index 8036c554ca..ddeb0885ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToManyMapping; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0; @@ -48,7 +48,7 @@ public class OrmEclipseLinkOneToManyMapping protected final OrmEclipseLinkConverterContainer converterContainer; - public OrmEclipseLinkOneToManyMapping(OrmModifiablePersistentAttribute parent, XmlOneToMany xmlMapping) { + public OrmEclipseLinkOneToManyMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToMany xmlMapping) { super(parent, xmlMapping); this.privateOwned = new OrmEclipseLinkPrivateOwned(this); this.joinFetch = new OrmEclipseLinkJoinFetch(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java index f0e00eb906..0601086cf6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToOneMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToOneMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; @@ -30,7 +30,7 @@ public class OrmEclipseLinkOneToOneMapping protected final OrmEclipseLinkJoinFetch joinFetch; - protected OrmEclipseLinkOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlOneToOne xmlMapping) { + protected OrmEclipseLinkOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlOneToOne xmlMapping) { super(parent, xmlMapping); this.privateOwned = new OrmEclipseLinkPrivateOwned(this); this.joinFetch = new OrmEclipseLinkJoinFetch(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3.java index 29cd236af8..20230b5f69 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -24,7 +24,7 @@ public class OrmEclipseLinkStructureMapping2_3 extends AbstractOrmAttributeMapping<XmlStructure> implements EclipseLinkStructureMapping2_3 { - public OrmEclipseLinkStructureMapping2_3(OrmModifiablePersistentAttribute parent, XmlStructure xmlMapping) { + public OrmEclipseLinkStructureMapping2_3(OrmSpecifiedPersistentAttribute parent, XmlStructure xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java index 0419c50146..73c2759bbf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkStructureMapping2_3Definition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkStructureMapping2_3Definition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return new OrmEclipseLinkStructureMapping2_3(parent, (XmlStructure) resourceMapping); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java index e43c2ff545..2f17721e3f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -24,7 +24,7 @@ public class OrmEclipseLinkTransformationMapping extends AbstractOrmAttributeMapping<XmlTransformation> implements EclipseLinkTransformationMapping { - public OrmEclipseLinkTransformationMapping(OrmModifiablePersistentAttribute parent, XmlTransformation xmlMapping) { + public OrmEclipseLinkTransformationMapping(OrmSpecifiedPersistentAttribute parent, XmlTransformation xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java index 57b4a7c8db..1b5a1d05de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkTransformationMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkTransformationMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return ((EclipseLinkOrmXmlContextModelFactory) factory). diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java index 0632483ddf..13d9422cc5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -22,7 +22,7 @@ public class OrmEclipseLinkVariableOneToOneMapping extends AbstractOrmAttributeMapping<XmlVariableOneToOne> implements EclipseLinkVariableOneToOneMapping { - public OrmEclipseLinkVariableOneToOneMapping(OrmModifiablePersistentAttribute parent, XmlVariableOneToOne xmlMapping) { + public OrmEclipseLinkVariableOneToOneMapping(OrmSpecifiedPersistentAttribute parent, XmlVariableOneToOne xmlMapping) { super(parent, xmlMapping); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java index c167a87fcd..fbf7afe8ed 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVariableOneToOneMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextModelFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; @@ -56,7 +56,7 @@ public class OrmEclipseLinkVariableOneToOneMappingDefinition } public OrmAttributeMapping buildContextMapping( - OrmModifiablePersistentAttribute parent, + OrmSpecifiedPersistentAttribute parent, XmlAttributeMapping resourceMapping, OrmXmlContextModelFactory factory) { return ((EclipseLinkOrmXmlContextModelFactory) factory). diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java index 0407cf9e6a..f69b7709fe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java @@ -20,7 +20,7 @@ import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVersionMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -46,7 +46,7 @@ public class OrmEclipseLinkVersionMapping protected final OrmEclipseLinkConverterContainer converterContainer; - public OrmEclipseLinkVersionMapping(OrmModifiablePersistentAttribute parent, XmlVersion xmlMapping) { + public OrmEclipseLinkVersionMapping(OrmSpecifiedPersistentAttribute parent, XmlVersion xmlMapping) { super(parent, xmlMapping); this.mutable = new OrmEclipseLinkMutable(this); this.converterContainer = this.buildConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java index 4964f61102..086930bd7f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/VirtualJavaPersistentType.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.ManagedType; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaContextModel; @@ -203,11 +203,11 @@ public class VirtualJavaPersistentType // ********** attributes ********** //The VirtualJavaPersistentAttributes are built by the OrmEclipseLinkPersistentAttribute, no attributes here - public ListIterable<JavaModifiablePersistentAttribute> getAttributes() { + public ListIterable<JavaSpecifiedPersistentAttribute> getAttributes() { return EmptyListIterable.instance(); } - public JavaModifiablePersistentAttribute getAttributeNamed(String attributeName) { + public JavaSpecifiedPersistentAttribute getAttributeNamed(String attributeName) { return null; } @@ -215,7 +215,7 @@ public class VirtualJavaPersistentType return false; } - public JavaModifiablePersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute) { + public JavaSpecifiedPersistentAttribute getAttributeFor(JavaResourceAttribute javaResourceAttribute) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/jpql/spi/EclipseLinkDynamicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/jpql/spi/EclipseLinkDynamicMapping.java index 50aadf9505..1cff783687 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/jpql/spi/EclipseLinkDynamicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/jpql/spi/EclipseLinkDynamicMapping.java @@ -16,7 +16,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.jpql.spi; import java.lang.annotation.Annotation; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.jpql.spi.JpaTypeDeclaration; import org.eclipse.jpt.jpa.core.jpql.spi.JpaTypeRepository; @@ -147,9 +147,9 @@ public class EclipseLinkDynamicMapping implements IMapping { /** * Returns the mapping's attribute (typically its parent node in the containment hierarchy). * - * @return The {@link ModifiablePersistentAttribute} + * @return The {@link SpecifiedPersistentAttribute} */ - public ModifiablePersistentAttribute getAttribute() { + public SpecifiedPersistentAttribute getAttribute() { return delegate.getMapping().getPersistentAttribute(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java index 596508bc5a..c560835d3d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java @@ -38,7 +38,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmPersistentType; import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiMessages; @@ -68,7 +68,7 @@ import com.ibm.icu.text.Collator; public class AddVirtualAttributeDialog extends StatusDialog { private EclipseLinkOrmPersistentType persistentType; - private OrmModifiablePersistentAttribute addedAttribute; + private OrmSpecifiedPersistentAttribute addedAttribute; private Button attributeTypeBrowseButton; private Button targetTypeBrowserButton; @@ -380,7 +380,7 @@ public class AddVirtualAttributeDialog extends StatusDialog { super.okPressed(); } - public OrmModifiablePersistentAttribute openAndReturnAttribute() { + public OrmSpecifiedPersistentAttribute openAndReturnAttribute() { super.open(); return this.addedAttribute; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/handlers/AddVirtualAttributeHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/handlers/AddVirtualAttributeHandler.java index c07efa14bc..2c0ceea8c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/handlers/AddVirtualAttributeHandler.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/handlers/AddVirtualAttributeHandler.java @@ -14,7 +14,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmPersistentType; import org.eclipse.jpt.jpa.eclipselink.ui.internal.dialogs.AddVirtualAttributeDialog; import org.eclipse.jpt.jpa.ui.selection.JpaSelectionManager; @@ -43,7 +43,7 @@ public class AddVirtualAttributeHandler AddVirtualAttributeDialog dialog = new AddVirtualAttributeDialog(window.getShell(), persistentType); dialog.create(); dialog.setBlockOnOpen(true); - OrmModifiablePersistentAttribute attribute = dialog.openAndReturnAttribute(); + OrmSpecifiedPersistentAttribute attribute = dialog.openAndReturnAttribute(); if (attribute != null) { JpaSelectionManager selectionManager = PlatformTools.getAdapter(window, JpaSelectionManager.class); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java index 35c9717ff6..d4ed003f58 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; @@ -74,7 +74,7 @@ public class PersistentAttributeMapAsComposite } public void morphMapping(MappingUiDefinition definition) { - ((ModifiablePersistentAttribute) getSubject()).setMappingKey(definition.getKey()); + ((SpecifiedPersistentAttribute) getSubject()).setMappingKey(definition.getKey()); } public String getName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java index a83f418d98..0314dd0a70 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java @@ -13,7 +13,7 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPageManager; import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeMapAsComposite; import org.eclipse.swt.widgets.Composite; @@ -37,11 +37,11 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see JavaModifiablePersistentAttribute + * @see JavaSpecifiedPersistentAttribute * @see PersistentAttributeMapAsComposite */ public class JavaPersistentAttributeDetailsPageManager - extends PersistentAttributeDetailsPageManager<JavaModifiablePersistentAttribute> + extends PersistentAttributeDetailsPageManager<JavaSpecifiedPersistentAttribute> { public JavaPersistentAttributeDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(parent, widgetFactory, resourceManager); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java index 7e4049864c..ab4b5d311b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; @@ -43,8 +43,8 @@ public class JavaPersistentAttributeDetailsProvider } - public Class<JavaModifiablePersistentAttribute> getType() { - return JavaModifiablePersistentAttribute.class; + public Class<JavaSpecifiedPersistentAttribute> getType() { + return JavaSpecifiedPersistentAttribute.class; } public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java index e67ae96584..bf67348c14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeDetailsPageManager; import org.eclipse.jpt.jpa.ui.internal.details.PersistentAttributeMapAsComposite; @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see OrmModifiablePersistentAttribute + * @see OrmSpecifiedPersistentAttribute * @see PersistentAttributeMapAsComposite */ public class OrmPersistentAttributeDetailsPageManager diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java index 6c22162591..504aa97273 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; @@ -43,8 +43,8 @@ public class OrmPersistentAttributeDetailsProvider super(); } - public Class<OrmModifiablePersistentAttribute> getType() { - return OrmModifiablePersistentAttribute.class; + public Class<OrmSpecifiedPersistentAttribute> getType() { + return OrmSpecifiedPersistentAttribute.class; } public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/PersistentAttributeMapAsHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/PersistentAttributeMapAsHandler.java index ec4073ca8b..d3cc095a70 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/PersistentAttributeMapAsHandler.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/PersistentAttributeMapAsHandler.java @@ -15,7 +15,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.ui.selection.JpaSelectionManager; import org.eclipse.ui.ISources; import org.eclipse.ui.IViewPart; @@ -27,14 +27,14 @@ import org.eclipse.ui.services.IEvaluationService; /** * This handler changes the mapping type of the selected - * {@link ModifiablePersistentAttribute}(s). + * {@link SpecifiedPersistentAttribute}(s). * It will be invoked by the mapping action dynamically created by the * {@link org.eclipse.jpt.jpa.ui.internal.menus.PersistentAttributeMapAsContribution}. * <p> * See <code>org.eclipse.jpt.jpa.ui/plugin.xml</code>. * * @see org.eclipse.jpt.jpa.ui.internal.menus.PersistentAttributeMapAsContribution - * @see ModifiablePersistentAttribute + * @see SpecifiedPersistentAttribute * @version 2.0 * @since 2.0 */ @@ -44,7 +44,7 @@ public class PersistentAttributeMapAsHandler { /** * The unique identifier of the "Map As" command used for - * {@link ModifiablePersistentAttribute}(s). + * {@link SpecifiedPersistentAttribute}(s). * <p> * See <code>org.eclipse.jpt.jpa.ui/plugin.xml</code>. */ @@ -52,7 +52,7 @@ public class PersistentAttributeMapAsHandler /** * The unique identifier of the "Map As" command parameter used for - * {@link ModifiablePersistentAttribute}(s). + * {@link SpecifiedPersistentAttribute}(s). * <p> * See <code>org.eclipse.jpt.jpa.ui/plugin.xml</code>. */ @@ -73,7 +73,7 @@ public class PersistentAttributeMapAsHandler String mappingKey = event.getParameter(SPECIFIED_MAPPING_COMMAND_PARAMETER_ID); Object[] items = selection.toArray(); for (Object item : items) { - ModifiablePersistentAttribute attribute = (ModifiablePersistentAttribute) item; + SpecifiedPersistentAttribute attribute = (SpecifiedPersistentAttribute) item; attribute.setMappingKey(mappingKey); } this.setJpaSelection(items); @@ -82,7 +82,7 @@ public class PersistentAttributeMapAsHandler /** * When we are changing an attribute mapping in the <code>orm.xml</code> - * file (by calling {@link ModifiablePersistentAttribute#setMappingKey(String)}, + * file (by calling {@link SpecifiedPersistentAttribute#setMappingKey(String)}, * the following happens synchronously during the call:<ul> * <li>The mapping (persistent attribute) is removed from the XML file. * <li>The cursor moves to the empty position where the mapping used to be, @@ -111,7 +111,7 @@ public class PersistentAttributeMapAsHandler if (items.length == 1) { JpaSelectionManager mgr = this.getJpaSelectionManager(); mgr.setSelection(null); - mgr.setSelection((ModifiablePersistentAttribute) items[0]); + mgr.setSelection((SpecifiedPersistentAttribute) items[0]); } } @@ -143,12 +143,12 @@ public class PersistentAttributeMapAsHandler String commonDefaultKey = null; String commonSpecifiedKey = null; for (Object obj : selection.toArray()) { - if (! (obj instanceof ModifiablePersistentAttribute)) { + if (! (obj instanceof SpecifiedPersistentAttribute)) { //oddly enough, you have to check instanceof here, seems like a bug in the framework return false; } - ModifiablePersistentAttribute persistentAttribute = (ModifiablePersistentAttribute) obj; + SpecifiedPersistentAttribute persistentAttribute = (SpecifiedPersistentAttribute) obj; if (persistentAttribute.getMapping().isDefault()) { if (commonSpecifiedKey != null) { return false; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/RemovePersistentAttributeFromXmlHandler.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/RemovePersistentAttributeFromXmlHandler.java index 8e6b193118..417118514d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/RemovePersistentAttributeFromXmlHandler.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/handlers/RemovePersistentAttributeFromXmlHandler.java @@ -15,7 +15,7 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.ui.selection.JpaSelectionManager; import org.eclipse.ui.IWorkbenchWindow; @@ -41,7 +41,7 @@ public class RemovePersistentAttributeFromXmlHandler ArrayList<OrmPersistentAttribute> virtualAttributes = new ArrayList<OrmPersistentAttribute>(); IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getCurrentSelectionChecked(event); for (Object each : selection.toList()) { - OrmModifiablePersistentAttribute attribute = (OrmModifiablePersistentAttribute) each; + OrmSpecifiedPersistentAttribute attribute = (OrmSpecifiedPersistentAttribute) each; OrmPersistentAttribute newAttribute = attribute.removeFromXml(); if (newAttribute != null) { virtualAttributes.add(newAttribute); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java index 45310fe54a..f4b7e74e2f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.menus; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; @@ -21,7 +21,7 @@ import org.eclipse.ui.menus.CommandContributionItemParameter; /** * This menu contribution is responsible for populating the "Map As" menu with * the registered mapping types defined in the {@link JpaPlatformUi} for - * {@link ModifiablePersistentAttribute}s. + * {@link SpecifiedPersistentAttribute}s. */ public class PersistentAttributeMapAsContribution extends MapAsContribution<PersistentAttribute> @@ -58,7 +58,7 @@ public class PersistentAttributeMapAsContribution @Override protected DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, PersistentAttribute node) { - return getDefaultMappingUiDefinition(jpaPlatformUI, ((ModifiablePersistentAttribute) node).getDefaultMappingKey(), node.getResourceType()); + return getDefaultMappingUiDefinition(jpaPlatformUI, ((SpecifiedPersistentAttribute) node).getDefaultMappingKey(), node.getResourceType()); } protected DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, String defaultMappingKey, JptResourceType resourceType) { diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMapping.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMapping.java index 30fcff7d3a..67574fab94 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMapping.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.tests.extension.resource; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaAttributeMapping; public class JavaTestAttributeMapping @@ -20,7 +20,7 @@ public class JavaTestAttributeMapping public static final String TEST_ATTRIBUTE_ANNOTATION_NAME = "test.TestAttribute"; //$NON-NLS-1$ - public JavaTestAttributeMapping(JavaModifiablePersistentAttribute parent) { + public JavaTestAttributeMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMappingDefinition.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMappingDefinition.java index e08680285f..350b79f350 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMappingDefinition.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/JavaTestAttributeMappingDefinition.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; public class JavaTestAttributeMappingDefinition implements JavaAttributeMappingDefinition @@ -44,7 +44,7 @@ public class JavaTestAttributeMappingDefinition return JavaTestAttributeMapping.TEST_ATTRIBUTE_ANNOTATION_NAME; } - public boolean isSpecified(JavaModifiablePersistentAttribute persistentAttribute) { + public boolean isSpecified(JavaSpecifiedPersistentAttribute persistentAttribute) { return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; } @@ -52,7 +52,7 @@ public class JavaTestAttributeMappingDefinition return EmptyIterable.instance(); } - public JavaAttributeMapping buildMapping(JavaModifiablePersistentAttribute persistentAttribute, JpaFactory factory) { + public JavaAttributeMapping buildMapping(JavaSpecifiedPersistentAttribute persistentAttribute, JpaFactory factory) { return ((TestJpaFactory) factory).buildJavaTestAttributeMapping(persistentAttribute); } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJavaBasicMapping.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJavaBasicMapping.java index 361b4e96b9..b650654666 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJavaBasicMapping.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJavaBasicMapping.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.tests.extension.resource; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBasicMapping; public class TestJavaBasicMapping extends AbstractJavaBasicMapping { - public TestJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + public TestJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { super(parent); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaFactory.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaFactory.java index c822a4ca37..5620419080 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaFactory.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests.extension.resource/src/org/eclipse/jpt/jpa/core/tests/extension/resource/TestJpaFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.tests.extension.resource; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.internal.AbstractJpaFactory; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; @@ -25,7 +25,7 @@ public class TestJpaFactory } @Override - public JavaBasicMapping buildJavaBasicMapping(JavaModifiablePersistentAttribute parent) { + public JavaBasicMapping buildJavaBasicMapping(JavaSpecifiedPersistentAttribute parent) { return new TestJavaBasicMapping(parent); } @@ -33,7 +33,7 @@ public class TestJpaFactory return new JavaTestTypeMapping(parent); } - public JavaTestAttributeMapping buildJavaTestAttributeMapping(JavaModifiablePersistentAttribute parent) { + public JavaTestAttributeMapping buildJavaTestAttributeMapping(JavaSpecifiedPersistentAttribute parent) { return new JavaTestAttributeMapping(parent); } } diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java index 0d348d32dd..c2d8341735 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentAttributeTests.java @@ -24,11 +24,11 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; @@ -86,7 +86,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals("id", persistentAttribute.getName()); } @@ -95,7 +95,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping() instanceof JavaIdMapping); persistentAttribute.setMappingKey(null); @@ -106,7 +106,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping() instanceof JavaIdMapping); persistentAttribute.setMappingKey(null); @@ -117,7 +117,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertNotNull(persistentAttribute.getMapping()); @@ -127,7 +127,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); @@ -139,7 +139,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -149,7 +149,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); @@ -166,7 +166,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); persistentAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); @@ -183,7 +183,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); persistentAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); @@ -199,7 +199,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -213,7 +213,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -227,7 +227,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(AccessType.FIELD, persistentAttribute.getAccess()); assertEquals(AccessType.FIELD, persistentAttribute.getDefaultAccess()); assertEquals(null, persistentAttribute.getSpecifiedAccess()); @@ -237,7 +237,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertEquals(AccessType.PROPERTY, persistentAttribute.getAccess()); assertEquals(AccessType.PROPERTY, persistentAttribute.getDefaultAccess()); assertEquals(null, persistentAttribute.getSpecifiedAccess()); @@ -249,7 +249,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourceField resourceField = getJavaPersistentType().getJavaResourceType().getFields().iterator().next(); - JavaModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); + JavaSpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); assertTrue(attribute.isFor(resourceField)); } @@ -260,7 +260,7 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase JavaResourceMethod resourceGetter = methods.next(); JavaResourceMethod resourceSetter = methods.next(); - JavaModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); + JavaSpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("foo"); assertTrue(attribute.isFor(resourceGetter, resourceSetter)); } @@ -325,13 +325,13 @@ public class GenericJavaPersistentAttributeTests extends ContextModelTestCase IterableTools.get(getPersistenceUnit().getClassRefs(), 1).getJavaPersistentType(); // generic field - JavaModifiablePersistentAttribute genericAttribute = superclassPT.getAttributeNamed("genericField"); + JavaSpecifiedPersistentAttribute genericAttribute = superclassPT.getAttributeNamed("genericField"); assertEquals("java.lang.Number", genericAttribute.getTypeName()); assertEquals("java.lang.Number", genericAttribute.getTypeName(superclassPT)); assertEquals("java.lang.Long", genericAttribute.getTypeName(subclassPT)); // nongeneric field - JavaModifiablePersistentAttribute nongenericAttribute = superclassPT.getAttributeNamed("nongenericField"); + JavaSpecifiedPersistentAttribute nongenericAttribute = superclassPT.getAttributeNamed("nongenericField"); assertEquals("java.lang.Number", nongenericAttribute.getTypeName()); assertEquals("java.lang.Number", nongenericAttribute.getTypeName(superclassPT)); assertEquals("java.lang.Number", nongenericAttribute.getTypeName(subclassPT)); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java index 96d880209d..cc7e10ce70 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/GenericJavaPersistentTypeTests.java @@ -23,9 +23,9 @@ import org.eclipse.jpt.common.utility.reference.BooleanReference; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; @@ -661,7 +661,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase public void testAttributes() throws Exception { createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); assertEquals("id", attributes.next().getName()); assertFalse(attributes.hasNext()); @@ -671,9 +671,9 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute attribute = attributes.next(); + JavaSpecifiedPersistentAttribute attribute = attributes.next(); assertEquals("id", attribute.getName()); assertTrue(attribute.getAccessor() instanceof FieldAccessor); attribute = attributes.next(); @@ -703,7 +703,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("id"); assertEquals("id", attribute.getName()); assertNull(getJavaPersistentType().getAttributeNamed("name")); @@ -714,7 +714,7 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("name"); + SpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("name"); assertEquals("name", attribute.getName()); @@ -731,9 +731,9 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase ICompilationUnit testType = createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute idAttribute = attributes.next(); - JavaModifiablePersistentAttribute nameAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute idAttribute = attributes.next(); + JavaSpecifiedPersistentAttribute nameAttribute = attributes.next(); assertEquals("id", idAttribute.getName()); @@ -743,8 +743,8 @@ public class GenericJavaPersistentTypeTests extends ContextModelTestCase idField.rename("id2", false, null); attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute nameAttribute2 = attributes.next(); - JavaModifiablePersistentAttribute id2Attribute = attributes.next(); + JavaSpecifiedPersistentAttribute nameAttribute2 = attributes.next(); + JavaSpecifiedPersistentAttribute id2Attribute = attributes.next(); assertNotSame(idAttribute, id2Attribute); assertEquals("id2", id2Attribute.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java index 2e45ef98cd..99899f8539 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaBasicMappingTests.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -168,7 +168,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getDefaultFetch()); } @@ -177,7 +177,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getDefaultFetch()); } @@ -186,7 +186,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getFetch()); @@ -199,7 +199,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); @@ -218,7 +218,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMappingFetchOptionalSpecified(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(FetchType.EAGER, basicMapping.getSpecifiedFetch()); @@ -228,7 +228,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); @@ -250,7 +250,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createOrmXmlFile(); getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedAccess(AccessType.PROPERTY); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedFetch()); assertTrue(basicMapping.isDefault()); @@ -285,7 +285,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -317,7 +317,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -348,7 +348,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -378,7 +378,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -406,7 +406,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -432,7 +432,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -458,7 +458,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -484,7 +484,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -514,7 +514,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -542,7 +542,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -572,7 +572,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -601,7 +601,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isDefaultOptional()); } @@ -610,7 +610,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isDefaultOptional()); } @@ -619,7 +619,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(true, basicMapping.isOptional()); @@ -632,7 +632,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); @@ -651,7 +651,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMappingFetchOptionalSpecified(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(Boolean.FALSE, basicMapping.getSpecifiedOptional()); @@ -661,7 +661,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); @@ -681,7 +681,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); assertTrue(basicMapping.isDefault()); @@ -710,7 +710,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getSpecifiedOptional()); @@ -743,7 +743,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.getConverter().getType() == LobConverter.class); @@ -753,7 +753,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithLob(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertTrue(basicMapping.getConverter().getType() == LobConverter.class); @@ -763,7 +763,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); basicMapping.setConverter(LobConverter.class); @@ -780,7 +780,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertFalse(basicMapping.getConverter().getType() == LobConverter.class); @@ -802,7 +802,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); } @@ -811,7 +811,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); } @@ -820,7 +820,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -840,7 +840,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithEnumerated(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(EnumType.STRING, ((BaseEnumeratedConverter) basicMapping.getConverter()).getSpecifiedEnumType()); @@ -850,7 +850,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -878,7 +878,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -909,7 +909,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase resourceField.addAnnotation(TemporalAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(BaseTemporalConverter.class, basicMapping.getConverter().getType()); @@ -919,7 +919,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(BaseTemporalConverter.class, basicMapping.getConverter().getType()); @@ -930,7 +930,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -951,7 +951,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -978,7 +978,7 @@ public class JavaBasicMappingTests extends ContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getColumn().getSpecifiedName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java index 13685de713..875fff3a7d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaCascadeTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.context.Cascade; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; @@ -58,7 +58,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -86,7 +86,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -112,7 +112,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -140,7 +140,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -166,7 +166,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -194,7 +194,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -220,7 +220,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -248,7 +248,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -274,7 +274,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); @@ -302,7 +302,7 @@ public class JavaCascadeTests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaOneToOneMapping mapping = (JavaOneToOneMapping) persistentAttribute.getMapping(); Cascade cascade = mapping.getCascade(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java index 8772e7a592..c7a6cbb5fd 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedIdMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; @@ -115,7 +115,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -137,7 +137,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -156,7 +156,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createTestEntityWithEmbeddedIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -175,7 +175,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -195,7 +195,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -215,7 +215,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -235,7 +235,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -255,7 +255,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -275,7 +275,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -295,7 +295,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -315,7 +315,7 @@ public class JavaEmbeddedIdMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java index 2584bf8b23..9a41725794 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaEmbeddedMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -205,7 +205,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -226,7 +226,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -245,7 +245,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createTestEntityWithEmbeddedMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -265,7 +265,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Entity1"); addXmlClassRef(PACKAGE_NAME + ".Embeddable1"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertNotNull(persistentAttribute.getMapping()); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -311,7 +311,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -331,7 +331,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -351,7 +351,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -371,7 +371,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -391,7 +391,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -411,7 +411,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -431,7 +431,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -451,7 +451,7 @@ public class JavaEmbeddedMappingTests extends ContextModelTestCase createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedMapping embeddedMapping = (EmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java index de5073ac5e..f4cb116ecf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaIdMappingTests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -115,7 +115,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -145,7 +145,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -174,7 +174,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -204,7 +204,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -233,7 +233,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -262,7 +262,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -291,7 +291,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -320,7 +320,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -349,7 +349,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -378,7 +378,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); idMapping.getColumn().setSpecifiedName("FOO"); @@ -407,7 +407,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) idMapping.getConverter()).getTemporalType()); @@ -417,7 +417,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); @@ -438,7 +438,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); @@ -464,7 +464,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getColumn().getSpecifiedName()); @@ -485,7 +485,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); assertEquals(0, idMapping.getPersistenceUnit().getGeneratorsSize()); @@ -507,7 +507,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getSequenceGenerator()); @@ -533,7 +533,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -560,7 +560,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); assertEquals(0, idMapping.getPersistenceUnit().getGeneratorsSize()); @@ -581,7 +581,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratorContainer().getTableGenerator()); @@ -607,7 +607,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -634,7 +634,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratedValue()); @@ -652,7 +652,7 @@ public class JavaIdMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); createTestEntityWithIdMappingGeneratedValue(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -666,7 +666,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getGeneratedValue()); @@ -692,7 +692,7 @@ public class JavaIdMappingTests extends ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java index 7db978d9e2..74faa95b9c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToManyMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; @@ -300,7 +300,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -322,7 +322,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -342,7 +342,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -364,7 +364,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -386,7 +386,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -408,7 +408,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -430,7 +430,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -452,7 +452,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -474,7 +474,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -496,7 +496,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); manyToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); manyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -518,7 +518,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -545,7 +545,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -570,7 +570,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -603,7 +603,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -632,7 +632,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -659,7 +659,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -687,7 +687,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping mapping = (ManyToManyMapping) contextAttribute.getMapping(); ManyToManyRelationship rel = mapping.getRelationship(); @@ -716,7 +716,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); ManyToManyAnnotation annotation = (ManyToManyAnnotation) resourceField.getAnnotation(JPA.MANY_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping mapping = (ManyToManyMapping) contextAttribute.getMapping(); ManyToManyRelationship rel = mapping.getRelationship(); @@ -762,7 +762,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -796,7 +796,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -826,7 +826,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultTargetEntity()); @@ -838,7 +838,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultTargetEntity()); @@ -849,7 +849,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", manyToManyMapping.getTargetEntity()); @@ -865,7 +865,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -898,7 +898,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -936,7 +936,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1006,7 +1006,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1034,7 +1034,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1059,7 +1059,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1089,7 +1089,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1115,7 +1115,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1145,7 +1145,7 @@ public class JavaManyToManyMappingTests extends ContextModelTestCase createTestEntityWithManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java index 43b3a4f901..79d4a15955 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaManyToOneMappingTests.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; @@ -179,7 +179,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -200,7 +200,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -219,7 +219,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -240,7 +240,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -261,7 +261,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -282,7 +282,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -303,7 +303,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -324,7 +324,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -345,7 +345,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -366,7 +366,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -387,7 +387,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -414,7 +414,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -439,7 +439,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -471,7 +471,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -502,7 +502,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -576,7 +576,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -593,7 +593,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -614,7 +614,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -636,7 +636,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -657,7 +657,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -705,7 +705,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -747,7 +747,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -802,7 +802,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = manyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -821,7 +821,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping mapping = (ManyToOneMapping) contextAttribute.getMapping(); ManyToOneRelationship rel = mapping.getRelationship(); @@ -839,7 +839,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping mapping = (ManyToOneMapping) contextAttribute.getMapping(); ManyToOneRelationship rel = mapping.getRelationship(); @@ -862,7 +862,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -892,7 +892,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertNull(manyToOneMapping.getDefaultTargetEntity()); @@ -904,7 +904,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertNull(manyToOneMapping.getDefaultTargetEntity()); @@ -916,7 +916,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", manyToOneMapping.getTargetEntity()); @@ -932,7 +932,7 @@ public class JavaManyToOneMappingTests extends ContextModelTestCase createTestEntityWithValidManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java index f4d7e290ec..eb75b76633 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToManyMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToManyRelationship; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; @@ -301,7 +301,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -323,7 +323,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -343,7 +343,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -365,7 +365,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -387,7 +387,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -409,7 +409,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -431,7 +431,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -453,7 +453,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -475,7 +475,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -497,7 +497,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); oneToManyMapping.getOrderable().setSpecifiedOrderBy("asdf"); oneToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable().setSpecifiedName("FOO"); @@ -520,7 +520,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -547,7 +547,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -572,7 +572,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -605,7 +605,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -634,7 +634,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -661,7 +661,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -691,7 +691,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -729,7 +729,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping mapping = (OneToManyMapping) contextAttribute.getMapping(); OneToManyRelationship rel = mapping.getRelationship(); @@ -758,7 +758,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping mapping = (OneToManyMapping) contextAttribute.getMapping(); OneToManyRelationship rel = mapping.getRelationship(); @@ -801,7 +801,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -831,7 +831,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultTargetEntity()); @@ -843,7 +843,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultTargetEntity()); @@ -854,7 +854,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", oneToManyMapping.getTargetEntity()); @@ -870,7 +870,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -903,7 +903,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -941,7 +941,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1012,7 +1012,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1040,7 +1040,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1065,7 +1065,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1095,7 +1095,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1125,7 +1125,7 @@ public class JavaOneToManyMappingTests extends ContextModelTestCase createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java index a603db2b5c..6a8d84c047 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaOneToOneMappingTests.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -213,7 +213,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -234,7 +234,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -253,7 +253,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -274,7 +274,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -295,7 +295,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -316,7 +316,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -337,7 +337,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -358,7 +358,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -379,7 +379,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -400,7 +400,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); joinColumns.addSpecifiedJoinColumn(0); @@ -422,7 +422,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -449,7 +449,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -474,7 +474,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); MappedByRelationshipStrategy mappedBy = oneToOneMapping.getRelationship().getMappedByStrategy(); @@ -502,7 +502,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); MappedByRelationshipStrategy mappedBy = oneToOneMapping.getRelationship().getMappedByStrategy(); @@ -528,7 +528,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -561,7 +561,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -591,7 +591,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -623,7 +623,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -652,7 +652,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -726,7 +726,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -743,7 +743,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -768,7 +768,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -791,7 +791,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -813,7 +813,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -861,7 +861,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -904,7 +904,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -960,7 +960,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JoinColumnRelationshipStrategy joinColumns = oneToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -981,7 +981,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -1015,7 +1015,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -1045,7 +1045,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertNull(oneToOneMapping.getDefaultTargetEntity()); @@ -1057,7 +1057,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertNull(oneToOneMapping.getDefaultTargetEntity()); @@ -1068,7 +1068,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestTargetEntityAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", oneToOneMapping.getTargetEntity()); @@ -1084,7 +1084,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); //targetEntity not in the persistence unit @@ -1116,7 +1116,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1186,7 +1186,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1204,7 +1204,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1227,7 +1227,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1250,7 +1250,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1299,7 +1299,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase createTestEntityWithOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1345,7 +1345,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); PrimaryKeyJoinColumnRelationshipStrategy strategy = oneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); @@ -1403,7 +1403,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping mapping = (OneToOneMapping) contextAttribute.getMapping(); OneToOneRelationship rel = mapping.getRelationship(); @@ -1446,7 +1446,7 @@ public class JavaOneToOneMappingTests extends ContextModelTestCase JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping mapping = (OneToOneMapping) contextAttribute.getMapping(); OneToOneRelationship rel = mapping.getRelationship(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java index cd84eb269a..1450205638 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.As import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; @@ -105,7 +105,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase assertEquals("id", specifiedPkJoinColumn.getDefaultName()); //remove @Id annotation - ModifiablePersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); idAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertNull(specifiedPkJoinColumn.getDefaultName()); @@ -216,7 +216,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase //remove @Id annotation - ModifiablePersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); idAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertNull(specifiedPkJoinColumn.getDefaultReferencedColumnName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java index f5fa74128d..13b218f84e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaSecondaryTableTests.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.SpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.SecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPrimaryKeyJoinColumn; @@ -479,7 +479,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase //remove @Id annotation - ModifiablePersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); idAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertNull(defaultPkJoinColumn.getDefaultName()); @@ -493,7 +493,7 @@ public class JavaSecondaryTableTests extends ContextModelTestCase assertEquals("id", defaultPkJoinColumn.getDefaultReferencedColumnName()); //remove @Id annotation - ModifiablePersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idAttribute = getJavaPersistentType().getAttributeNamed("id"); idAttribute.setMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertNull(defaultPkJoinColumn.getDefaultReferencedColumnName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java index 404dbfcf1d..f9a651d547 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaTransientMappingTests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.resource.java.BasicAnnotation; @@ -70,7 +70,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -88,7 +88,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -105,7 +105,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -122,7 +122,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -139,7 +139,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -156,7 +156,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -173,7 +173,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -190,7 +190,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -207,7 +207,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -224,7 +224,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -241,7 +241,7 @@ public class JavaTransientMappingTests extends ContextModelTestCase createTestEntityWithTransientMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); TransientMapping transientMapping = (TransientMapping) persistentAttribute.getMapping(); assertNotNull(transientMapping); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java index 63b04a199a..efa1a84397 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/java/JavaVersionMappingTests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -92,7 +92,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -116,7 +116,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -139,7 +139,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -163,7 +163,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -186,7 +186,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -209,7 +209,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -232,7 +232,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -255,7 +255,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -278,7 +278,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -301,7 +301,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -325,7 +325,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithTemporal(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertEquals(TemporalType.TIMESTAMP, ((BaseTemporalConverter) versionMapping.getConverter()).getTemporalType()); @@ -335,7 +335,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); @@ -356,7 +356,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); @@ -382,7 +382,7 @@ public class JavaVersionMappingTests extends ContextModelTestCase createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getColumn().getSpecifiedName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java index a68e64fcca..179f324eea 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentAttributeTests.java @@ -18,9 +18,9 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmIdMapping; @@ -108,7 +108,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -117,7 +117,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -142,7 +142,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(2, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertTrue(specifiedOrmPersistentAttribute.getMapping() instanceof GenericOrmOneToOneMapping); @@ -153,7 +153,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -176,7 +176,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -211,7 +211,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.removeFromXml(); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); @@ -260,7 +260,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); //virtual orm attribute, access type matches java : FIELD, name matches java assertTrue(ormPersistentAttribute.isVirtual()); @@ -282,7 +282,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java //verify both the property java resource attribute and the field java resource attribute are used in orm //because the field is annotated and property is specified - ((OrmModifiablePersistentAttribute) ormPersistentAttribute).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) ormPersistentAttribute).removeFromXml(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); @@ -302,7 +302,7 @@ public class GenericOrmPersistentAttributeTests extends ContextModelTestCase ormPersistentType.setSpecifiedAccess(null);//default access will be field ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - OrmModifiablePersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); ormPersistentAttribute2.getMapping().setName("id2"); assertEquals(null, ormPersistentAttribute2.getJavaPersistentAttribute()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java index 05eec98519..a739515be9 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/GenericOrmPersistentTypeTests.java @@ -14,9 +14,9 @@ import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.Sourc import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -172,7 +172,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("id", entity.getAttributes().getIds().get(0).getName()); - ((OrmModifiablePersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); assertNull(entity.getAttributes()); } @@ -184,7 +184,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("id", entity.getAttributes().getBasics().get(0).getName()); - ((OrmModifiablePersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); assertNull(entity.getAttributes()); } @@ -196,7 +196,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("id", entity.getAttributes().getVersions().get(0).getName()); - ((OrmModifiablePersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); assertNull(entity.getAttributes()); } @@ -208,7 +208,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("id", entity.getAttributes().getEmbeddeds().get(0).getName()); - ((OrmModifiablePersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); assertNull(entity.getAttributes()); } @@ -220,7 +220,7 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase assertEquals("id", entity.getAttributes().getTransients().get(0).getName()); - ((OrmModifiablePersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) entityPersistentType.getAttributeNamed("id")).removeFromXml(); assertNull(entity.getAttributes()); } @@ -484,16 +484,16 @@ public class GenericOrmPersistentTypeTests extends ContextModelTestCase OrmPersistentType employeePersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_EMPLOYEE_TYPE_NAME); - OrmModifiablePersistentAttribute attribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute attribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); attribute.getMapping().setName("id"); attribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); attribute.getMapping().setName("name"); - OrmModifiablePersistentAttribute startDateAttribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute startDateAttribute = employeePersistentType.addAttributeToXml(employeePersistentType.getAttributeNamed("startDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); ((OrmBasicMapping) startDateAttribute.getMapping()).setConverter(BaseTemporalConverter.class); ((BaseTemporalConverter) ((OrmBasicMapping) startDateAttribute.getMapping()).getConverter()).setTemporalType(TemporalType.DATE); OrmPersistentAttribute idAttribute = employeePersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = idAttribute.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = idAttribute.getJavaPersistentAttribute(); assertNotNull(javaPersistentAttribute); assertEquals("id", javaPersistentAttribute.getName()); assertEquals("test.Employee", javaPersistentAttribute.getOwningPersistentType().getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java index 1e2b45ca4e..0f276872e5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmBasicMappingTests.java @@ -32,7 +32,7 @@ import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -87,7 +87,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -108,7 +108,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -129,7 +129,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -154,7 +154,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -179,7 +179,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateSpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -204,7 +204,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifySpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -230,7 +230,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateSpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -255,7 +255,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifySpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -280,7 +280,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateSpecifiedLob() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -301,7 +301,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifySpecifiedLob() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -322,7 +322,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testUpdateTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -351,7 +351,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testModifyTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); @@ -389,7 +389,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); ormBasicMapping.setName("foo"); @@ -491,7 +491,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormBasicMapping.getName()); @@ -534,7 +534,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToIdMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -556,7 +556,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToVersionMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -578,7 +578,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToTransientMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -599,7 +599,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToEmbeddedMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -620,7 +620,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToEmbeddedIdMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -641,7 +641,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToOneToOneMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -662,7 +662,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToOneToManyMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -683,7 +683,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToManyToOneMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); @@ -704,7 +704,7 @@ public class OrmBasicMappingTests extends ContextModelTestCase public void testBasicMorphToManyToManyMapping() throws Exception { createTestEntityBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); BasicMapping basicMapping = (BasicMapping) ormPersistentAttribute.getMapping(); assertFalse(basicMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmCascadeTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmCascadeTests.java index dafe58e7b1..45b080f769 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmCascadeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmCascadeTests.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.context.orm; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; @@ -41,7 +41,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testUpdateCascadeAll() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade cascade = ormOneToOneMapping.getCascade(); @@ -68,7 +68,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testModifyCascadeAll() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -91,7 +91,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testUpdateCascadePersist() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade cascade = ormOneToOneMapping.getCascade(); @@ -118,7 +118,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testModifyCascadePersist() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -141,7 +141,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testUpdateCascadeMerge() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade cascade = ormOneToOneMapping.getCascade(); @@ -168,7 +168,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testModifyCascadeMerge() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -191,7 +191,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testUpdateCascadeRemove() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade cascade = ormOneToOneMapping.getCascade(); @@ -218,7 +218,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testModifyCascadeRemove() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -241,7 +241,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testUpdateCascadeRefresh() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade cascade = ormOneToOneMapping.getCascade(); @@ -268,7 +268,7 @@ public class OrmCascadeTests extends ContextModelTestCase public void testModifyCascadeRefresh() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java index d06828a3b0..fb3ce08ad6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmColumnTests.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -69,7 +69,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -102,7 +102,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -126,7 +126,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateColumnDefinition() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -159,7 +159,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifyColumnDefinition() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -183,7 +183,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedTable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -216,7 +216,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedTable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -240,7 +240,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedNullable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -273,7 +273,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedNullable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -297,7 +297,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedUpdatable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -330,7 +330,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedUpdatable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -354,7 +354,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedInsertable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -387,7 +387,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedInsertable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -411,7 +411,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedUnique() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -444,7 +444,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedUnique() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -468,7 +468,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedLength() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -501,7 +501,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedLength() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -525,7 +525,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedPrecision() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -558,7 +558,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedPrecision() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -582,7 +582,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testUpdateSpecifiedScale() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -615,7 +615,7 @@ public class OrmColumnTests extends ContextModelTestCase public void testModifySpecifiedScale() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = ormBasicMapping.getColumn(); @@ -752,7 +752,7 @@ public class OrmColumnTests extends ContextModelTestCase createTestEntity(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute namePersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("name"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute namePersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("name"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping nameVirtualMapping = (OrmBasicMapping) namePersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = nameVirtualMapping.getColumn(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java index 75f9503f6a..927c7cd4d6 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedIdMappingTests.java @@ -36,7 +36,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; @@ -323,7 +323,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToIdMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -344,7 +344,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToVersionMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -365,7 +365,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToTransientMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -386,7 +386,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToBasicMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -407,7 +407,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToEmbeddedMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -431,7 +431,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToOneToOneMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -452,7 +452,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToOneToManyMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -473,7 +473,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToManyToOneMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -492,7 +492,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testEmbeddedIdMorphToManyToManyMapping() throws Exception { createTestEntityEmbeddedIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -513,7 +513,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedIdMapping ormEmbeddedMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); XmlEmbeddedId embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); @@ -534,7 +534,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedIdMapping ormEmbeddedMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); XmlEmbeddedId embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); @@ -555,7 +555,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testMoveSpecifiedAttributeOverride() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedIdMapping.getAttributeOverrideContainer(); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); @@ -595,7 +595,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase public void testUpdateAttributeOverrides() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedIdMapping.getAttributeOverrideContainer(); XmlEmbeddedId embeddedIdResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddedIds().get(0); @@ -653,7 +653,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); ormEmbeddedIdMapping.setName("foo"); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedIdMapping.getAttributeOverrideContainer(); @@ -885,7 +885,7 @@ public class OrmEmbeddedIdMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedIdMapping ormEmbeddedIdMapping = (OrmEmbeddedIdMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedIdMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java index 4d37973d4d..7d2b8339b0 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmEmbeddedMappingTests.java @@ -36,7 +36,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; @@ -222,7 +222,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -243,7 +243,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -324,7 +324,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testMoveSpecifiedAttributeOverride() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -364,7 +364,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testUpdateAttributeOverrides() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -422,7 +422,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); ormEmbeddedMapping.setName("foo"); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); @@ -649,7 +649,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedMapping.getName()); @@ -693,7 +693,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToIdMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -714,7 +714,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToVersionMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -735,7 +735,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToTransientMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -756,7 +756,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToBasicMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -777,7 +777,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToEmbeddedIdMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -801,7 +801,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToOneToOneMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -822,7 +822,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToOneToManyMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -843,7 +843,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToManyToOneMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -864,7 +864,7 @@ public class OrmEmbeddedMappingTests extends ContextModelTestCase public void testEmbeddedMorphToManyToManyMapping() throws Exception { createTestEntityEmbeddedMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java index e00dff2c50..5ec23db963 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmGeneratedValueTests.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.GenerationType; import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratedValue; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -65,7 +65,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; public void testUpdateSpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); OrmGeneratedValue ormGeneratedValue = ormIdMapping.addGeneratedValue(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -85,7 +85,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; public void testModifySpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); OrmGeneratedValue ormGeneratedValue = ormIdMapping.addGeneratedValue(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -127,7 +127,7 @@ import org.eclipse.jpt.jpa.core.tests.internal.context.ContextModelTestCase; assertEquals("Foo", javaGeneratedValue.getSpecifiedGenerator()); assertEquals(GenerationType.SEQUENCE, javaGeneratedValue.getSpecifiedStrategy()); - ((OrmModifiablePersistentAttribute) ormIdAttribute).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) ormIdAttribute).removeFromXml(); ormIdAttribute = ormPersistentType.getAttributeNamed("id"); ormIdMapping = (IdMapping) ormIdAttribute.getMapping(); assertEquals("Foo", ormIdMapping.getGeneratedValue().getSpecifiedGenerator()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java index e3f89ffce6..d4142f2301 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmIdMappingTests.java @@ -32,7 +32,7 @@ import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -91,7 +91,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -112,7 +112,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -133,7 +133,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testUpdateTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -162,7 +162,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testModifyTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -196,7 +196,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testAddSequenceGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -220,7 +220,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testRemoveSequenceGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -248,7 +248,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testUpdateSequenceGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -273,7 +273,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testAddTableGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -297,7 +297,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testRemoveTableGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -325,7 +325,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testUpdateTableGenerator() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -350,7 +350,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testAddGeneratedValue() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -374,7 +374,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testRemoveGeneratedValue() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -402,7 +402,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testUpdateGeneratedValue() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); @@ -427,7 +427,7 @@ public class OrmIdMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); ormIdMapping.setName("foo"); @@ -558,7 +558,7 @@ public class OrmIdMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormIdMapping.getName()); @@ -599,7 +599,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToBasicMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -619,7 +619,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToVersionMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -639,7 +639,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToTransientMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -656,7 +656,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToEmbeddedMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -675,7 +675,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToEmbeddedIdMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -692,7 +692,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToOneToOneMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -711,7 +711,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToOneToManyMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -730,7 +730,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToManyToOneMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); @@ -749,7 +749,7 @@ public class OrmIdMappingTests extends ContextModelTestCase public void testIdMorphToManyToManyMapping() throws Exception { createTestEntityIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); IdMapping idMapping = (IdMapping) ormPersistentAttribute.getMapping(); assertFalse(idMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java index 1fe9a5b6da..89eb39087b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinColumnTests.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; @@ -42,7 +42,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -76,7 +76,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -102,7 +102,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedReferencedColumnName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -136,7 +136,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedReferencedColumnName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -162,7 +162,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedColumnDefinition() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -196,7 +196,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedColumnDefinition() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -222,7 +222,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedTable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -256,7 +256,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedTable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -282,7 +282,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedNullable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -316,7 +316,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedNullable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -342,7 +342,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedUpdatable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -376,7 +376,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedUpdatable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -402,7 +402,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedInsertable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -436,7 +436,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedInsertable() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -462,7 +462,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testUpdateSpecifiedUnique() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -496,7 +496,7 @@ public class OrmJoinColumnTests extends ContextModelTestCase public void testModifySpecifiedUnique() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java index 773682c3c6..7b0970bbfc 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmJoinTableTests.java @@ -25,12 +25,12 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmUniqueConstraint; @@ -140,7 +140,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateSpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -173,7 +173,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testModifySpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -221,7 +221,7 @@ public class OrmJoinTableTests extends ContextModelTestCase // assertEquals("id_project_id", inverseOrmJoinColumn.getDefaultName()); // assertEquals("id_project_id", inverseOrmJoinColumn.getDefaultReferencedColumnName()); - JavaModifiablePersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); JavaManyToManyMapping javaManyToManyMapping = (JavaManyToManyMapping) javaPersistentAttribute.getMapping(); JavaJoinTable javaJoinTable = javaManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); javaJoinTable.setSpecifiedName("FOO"); @@ -252,7 +252,7 @@ public class OrmJoinTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); OrmJoinTable ormJoinTable = ormManyToManyMapping.getRelationship().getJoinTableStrategy().getJoinTable(); @@ -307,7 +307,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateSpecifiedSchema() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -426,7 +426,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testModifySpecifiedSchema() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -449,7 +449,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateSpecifiedCatalog() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -481,7 +481,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testModifySpecifiedCatalog() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -614,7 +614,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testAddSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -653,7 +653,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testRemoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -682,7 +682,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testMoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -721,7 +721,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateInverseJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -775,7 +775,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testAddSpecifiedInverseJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -814,7 +814,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testRemoveSpecifiedInverseJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -843,7 +843,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testMoveSpecifiedInverseJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -882,7 +882,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -937,7 +937,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUniqueConstraints() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -966,7 +966,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUniqueConstraintsSize() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -990,7 +990,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testAddUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1013,7 +1013,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testAddUniqueConstraint2() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1036,7 +1036,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testRemoveUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1083,7 +1083,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testMoveUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1125,7 +1125,7 @@ public class OrmJoinTableTests extends ContextModelTestCase public void testUpdateUniqueConstraints() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java index b7dc595771..0f4842de68 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToManyMappingTests.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -259,7 +259,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -280,7 +280,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -301,7 +301,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -322,7 +322,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifyTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -343,7 +343,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -368,7 +368,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -393,7 +393,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormManyToManyMapping.getRelationship().getMappedByStrategy(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -415,7 +415,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifyMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormManyToManyMapping.getRelationship().getMappedByStrategy(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -507,7 +507,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -538,7 +538,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifyMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -594,7 +594,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testUpdateOrderBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -615,7 +615,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testModifyOrderBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -636,7 +636,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testIsNoOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering()); @@ -651,7 +651,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testSetNoOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertTrue(ormManyToManyMapping.getOrderable().isNoOrdering()); @@ -675,7 +675,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testIsCustomOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(ormManyToManyMapping.getOrderable().isCustomOrdering()); @@ -690,7 +690,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -710,7 +710,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToVersionMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -730,7 +730,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToTransientMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -750,7 +750,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToEmbeddedMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -770,7 +770,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToEmbeddedIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -790,7 +790,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToOneToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -824,7 +824,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToOneToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -869,7 +869,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToManyToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -901,7 +901,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase public void testManyToManyMorphToBasicMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(manyToManyMapping.isDefault()); @@ -1067,7 +1067,7 @@ public class OrmManyToManyMappingTests extends ContextModelTestCase assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - OrmModifiablePersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToManyMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java index 78ce4921cb..11eba83547 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmManyToOneMappingTests.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -134,7 +134,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -155,7 +155,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -176,7 +176,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testUpdateTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -197,7 +197,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testModifyTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -218,7 +218,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -243,7 +243,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -268,7 +268,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testUpdateSpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -293,7 +293,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testModifySpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -318,7 +318,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testAddSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormManyToOneMapping.getRelationship().getJoinColumnStrategy(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -355,7 +355,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testRemoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormManyToOneMapping.getRelationship().getJoinColumnStrategy(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -422,7 +422,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase public void testMoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormManyToOneMapping.getRelationship().getJoinColumnStrategy(); XmlManyToOne manyToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToOnes().get(0); @@ -466,7 +466,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); ormManyToOneMapping.setName("foo"); OrmJoinColumnRelationshipStrategy strategy = ormManyToOneMapping.getRelationship().getJoinColumnStrategy(); @@ -580,7 +580,7 @@ public class OrmManyToOneMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java index 644a29e3a3..6ad671590c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToManyMappingTests.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -234,7 +234,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -255,7 +255,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -276,7 +276,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -297,7 +297,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifyTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -318,7 +318,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -343,7 +343,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -368,7 +368,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormOneToManyMapping.getRelationship().getMappedByStrategy(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -390,7 +390,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifyMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormOneToManyMapping.getRelationship().getMappedByStrategy(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -482,7 +482,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -548,7 +548,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifyMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -569,7 +569,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testUpdateOrderBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -590,7 +590,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testModifyOrderBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -611,7 +611,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testIsNoOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering()); @@ -626,7 +626,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testSetNoOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); assertTrue(ormOneToManyMapping.getOrderable().isNoOrdering()); @@ -650,7 +650,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testIsCustomOrdering() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(ormOneToManyMapping.getOrderable().isCustomOrdering()); @@ -665,7 +665,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -686,7 +686,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToVersionMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -713,7 +713,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToTransientMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -734,7 +734,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToEmbeddedMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -761,7 +761,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToEmbeddedIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -782,7 +782,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToOneToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -816,7 +816,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToManyToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -861,7 +861,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToManyToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); @@ -894,7 +894,7 @@ public class OrmOneToManyMappingTests extends ContextModelTestCase public void testOneToManyMorphToBasicMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToManyMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java index 2277fc4a8b..aea4d5d1cb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmOneToOneMappingTests.java @@ -35,7 +35,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationshipStrategy; @@ -193,7 +193,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -214,7 +214,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -235,7 +235,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testUpdateSpecifiedTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -256,7 +256,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testModifySpecifiedTargetEntity() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -277,7 +277,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -302,7 +302,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -327,7 +327,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testUpdateMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getMappedByStrategy(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -349,7 +349,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testModifyMappedBy() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); MappedByRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getMappedByStrategy(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -483,7 +483,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testUpdateSpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -508,7 +508,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testModifySpecifiedOptional() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -533,7 +533,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testAddSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -570,7 +570,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testRemoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -597,7 +597,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testMoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -640,7 +640,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); ormOneToOneMapping.setName("foo"); assertEquals("foo", ormOneToOneMapping.getName()); @@ -756,7 +756,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); @@ -803,7 +803,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -830,7 +830,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToVersionMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -857,7 +857,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToTransientMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -884,7 +884,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToEmbeddedMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -911,7 +911,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToEmbeddedIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -938,7 +938,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToManyToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -973,7 +973,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToOneToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -1008,7 +1008,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToManyToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -1046,7 +1046,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testOneToOneMorphToBasicMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping oneToOneMapping = (OneToOneMapping) ormPersistentAttribute.getMapping(); assertFalse(oneToOneMapping.isDefault()); @@ -1078,7 +1078,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testAddPrimaryKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmPrimaryKeyJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -1115,7 +1115,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testRemovePrimaryKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmPrimaryKeyJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -1142,7 +1142,7 @@ public class OrmOneToOneMappingTests extends ContextModelTestCase public void testMovePrimaryKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); OrmPrimaryKeyJoinColumnRelationshipStrategy strategy = ormOneToOneMapping.getRelationship().getPrimaryKeyJoinColumnStrategy(); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java index 4b148e6d1e..1dd840ab81 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmTransientMappingTests.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping; @@ -70,7 +70,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); OrmTransientMapping xmlTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); XmlTransient transientResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0); @@ -91,7 +91,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); OrmTransientMapping xmlTransientnMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); XmlTransient transientResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getTransients().get(0); @@ -118,7 +118,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmTransientMapping ormTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); ormTransientMapping.setName("foo"); assertEquals("foo", ormTransientMapping.getName()); @@ -166,7 +166,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmTransientMapping ormTransientMapping = (OrmTransientMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormTransientMapping.getName()); @@ -175,7 +175,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToIdMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -190,7 +190,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToVersionMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -205,7 +205,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToTransientMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -220,7 +220,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToEmbeddedMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -235,7 +235,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToEmbeddedIdMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -250,7 +250,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToOneToOneMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -265,7 +265,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToOneToManyMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -280,7 +280,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToManyToOneMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); @@ -295,7 +295,7 @@ public class OrmTransientMappingTests extends ContextModelTestCase public void testTransientMorphToManyToManyMapping() throws Exception { createTestEntityTransientMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); TransientMapping transientMapping = (TransientMapping) ormPersistentAttribute.getMapping(); assertFalse(transientMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java index d809820d8a..3dee99167b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/context/orm/OrmVersionMappingTests.java @@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; @@ -79,7 +79,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); @@ -100,7 +100,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); @@ -121,7 +121,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testUpdateTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); @@ -150,7 +150,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testModifyTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); @@ -187,7 +187,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); ormVersionMapping.setName("foo"); assertEquals("foo", ormVersionMapping.getName()); @@ -287,7 +287,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); assertEquals("id", ormVersionMapping.getName()); @@ -320,7 +320,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToIdMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -340,7 +340,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToBasicMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -360,7 +360,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToTransientMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -379,7 +379,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToEmbeddedMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -398,7 +398,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToEmbeddedIdMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -417,7 +417,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToOneToOneMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -436,7 +436,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToOneToManyMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -455,7 +455,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToManyToOneMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); @@ -474,7 +474,7 @@ public class OrmVersionMappingTests extends ContextModelTestCase public void testVersionMorphToManyToManyMapping() throws Exception { createTestEntityVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); VersionMapping versionMapping = (VersionMapping) ormPersistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java index 41238c5fec..4444e1840e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaBasicMapping2_0Tests.java @@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -83,7 +83,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -116,7 +116,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -148,7 +148,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -178,7 +178,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -206,7 +206,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -234,7 +234,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -262,7 +262,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -294,7 +294,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -324,7 +324,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -356,7 +356,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -387,7 +387,7 @@ public class GenericJavaBasicMapping2_0Tests extends Generic2_0ContextModelTestC createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java index 5661d320c3..e1e6b8d364 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaCascade2_0Tests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OneToOne2_0Annotation; @@ -59,7 +59,7 @@ public class GenericJavaCascade2_0Tests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); Cascade2_0 cascade = (Cascade2_0) mapping.getCascade(); @@ -87,7 +87,7 @@ public class GenericJavaCascade2_0Tests JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOne2_0Annotation annotation = (OneToOne2_0Annotation) resourceField.getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); Cascade2_0 cascade = (Cascade2_0) mapping.getCascade(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java index 3be7efaa31..c1d8fbebea 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaElementCollectionMapping2_0Tests.java @@ -36,7 +36,7 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.TemporalType; @@ -407,7 +407,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -431,7 +431,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -453,7 +453,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -477,7 +477,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -501,7 +501,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -525,7 +525,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -549,7 +549,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -573,7 +573,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -597,7 +597,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -621,7 +621,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -646,7 +646,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -673,7 +673,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -699,7 +699,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -729,7 +729,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -741,7 +741,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -753,7 +753,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -765,7 +765,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -776,7 +776,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getTargetClass()); @@ -796,7 +796,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target embeddable not in the persistence unit @@ -828,7 +828,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target is a basic type, so resolved target embeddable is null @@ -839,7 +839,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -871,7 +871,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -901,7 +901,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.EMBEDDABLE_TYPE, elementCollectionMapping.getValueType()); @@ -912,7 +912,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.NO_TYPE, elementCollectionMapping.getValueType()); @@ -926,7 +926,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -936,7 +936,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -975,7 +975,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1007,7 +1007,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = @@ -1028,7 +1028,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); @@ -1052,7 +1052,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1093,7 +1093,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1120,7 +1120,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getDefaultMapKeyClass()); @@ -1134,7 +1134,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultMapKeyClass()); @@ -1144,7 +1144,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getMapKeyClass()); @@ -1160,7 +1160,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Orderable2_0 orderable = ((Orderable2_0) elementCollectionMapping.getOrderable()); @@ -1184,7 +1184,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getValueColumn().getSpecifiedName()); @@ -1623,7 +1623,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyColumn().getSpecifiedName()); @@ -2196,7 +2196,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2224,7 +2224,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2250,7 +2250,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2274,7 +2274,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2300,7 +2300,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); ListIterator<? extends SpecifiedJoinColumn> specifiedMapKeyJoinColumns = elementCollectionMapping.getSpecifiedMapKeyJoinColumns().iterator(); @@ -2369,7 +2369,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(0, elementCollectionMapping.getSpecifiedMapKeyJoinColumnsSize()); @@ -2387,7 +2387,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(1, elementCollectionMapping.getMapKeyJoinColumnsSize()); @@ -2407,7 +2407,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); elementCollectionMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2429,7 +2429,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); elementCollectionMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2451,7 +2451,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); elementCollectionMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2498,7 +2498,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); elementCollectionMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2540,7 +2540,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -2597,7 +2597,7 @@ public class GenericJavaElementCollectionMapping2_0Tests extends Generic2_0Conte addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertTrue(elementCollectionMapping.getDefaultMapKeyJoinColumn().isVirtual()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedIdMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedIdMapping2_0Tests.java index 7cbba4e7d8..22fc33d0fd 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedIdMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedIdMapping2_0Tests.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; @@ -109,7 +109,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -133,7 +133,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -154,7 +154,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createTestEntityWithEmbeddedIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); assertFalse(embeddedIdMapping.isDefault()); @@ -173,7 +173,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -195,7 +195,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -217,7 +217,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -239,7 +239,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -261,7 +261,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -283,7 +283,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -305,7 +305,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -327,7 +327,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -349,7 +349,7 @@ public class GenericJavaEmbeddedIdMapping2_0Tests extends Generic2_0ContextModel createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EmbeddedIdMapping embeddedIdMapping = (EmbeddedIdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java index 2ab7709fc2..c6e5d57e58 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaEmbeddedMapping2_0Tests.java @@ -33,7 +33,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverride; @@ -269,7 +269,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -295,7 +295,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -318,7 +318,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createTestEntityWithEmbeddedMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -338,7 +338,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe addXmlClassRef(PACKAGE_NAME + ".Entity1"); addXmlClassRef(PACKAGE_NAME + ".Embeddable1"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbeddable"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbeddable"); assertNotNull(persistentAttribute.getMapping()); assertEquals(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); assertTrue(persistentAttribute.getMapping().isDefault()); @@ -408,7 +408,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -432,7 +432,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -455,7 +455,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -479,7 +479,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -503,7 +503,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -527,7 +527,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -550,7 +550,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -574,7 +574,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -598,7 +598,7 @@ public class GenericJavaEmbeddedMapping2_0Tests extends Generic2_0ContextModelTe createEmbeddableType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributeNamed("myEmbedded"); JavaEmbeddedMapping embeddedMapping = (JavaEmbeddedMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java index bdbbf7aa60..fd0a5f9a2f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaIdMapping2_0Tests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -81,7 +81,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -113,7 +113,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -144,7 +144,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -176,7 +176,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -207,7 +207,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -238,7 +238,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -269,7 +269,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -300,7 +300,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -331,7 +331,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -362,7 +362,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -394,7 +394,7 @@ public class GenericJavaIdMapping2_0Tests extends Generic2_0ContextModelTestCase createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java index 67576851b1..4ae4224b04 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToManyMapping2_0Tests.java @@ -35,7 +35,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; @@ -375,7 +375,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -399,7 +399,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -421,7 +421,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -445,7 +445,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -469,7 +469,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -493,7 +493,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -517,7 +517,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -541,7 +541,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -565,7 +565,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -589,7 +589,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -613,7 +613,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -641,7 +641,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -684,7 +684,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -721,7 +721,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -762,7 +762,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -792,7 +792,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = @@ -815,7 +815,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); @@ -841,7 +841,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -879,7 +879,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -906,7 +906,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getDefaultMapKeyClass()); @@ -920,7 +920,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultMapKeyClass()); @@ -930,7 +930,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getMapKeyClass()); @@ -1070,7 +1070,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -1097,7 +1097,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.getRelationship().setStrategyToMappedBy(); manyToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employees"); @@ -1128,7 +1128,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -1536,7 +1536,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1564,7 +1564,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1590,7 +1590,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1614,7 +1614,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1640,7 +1640,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); ListIterator<? extends SpecifiedJoinColumn> specifiedMapKeyJoinColumns = manyToManyMapping.getSpecifiedMapKeyJoinColumns().iterator(); @@ -1709,7 +1709,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(0, manyToManyMapping.getSpecifiedMapKeyJoinColumnsSize()); @@ -1727,7 +1727,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(1, manyToManyMapping.getMapKeyJoinColumnsSize()); @@ -1747,7 +1747,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -1769,7 +1769,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -1791,7 +1791,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -1838,7 +1838,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -1880,7 +1880,7 @@ public class GenericJavaManyToManyMapping2_0Tests createTestEntityWithEntityKeyManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -1937,7 +1937,7 @@ public class GenericJavaManyToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertTrue(manyToManyMapping.getDefaultMapKeyJoinColumn().isVirtual()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java index 777017e440..e60859bad7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaManyToOneMapping2_0Tests.java @@ -25,13 +25,13 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; @@ -136,7 +136,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -159,7 +159,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -180,7 +180,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -203,7 +203,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -226,7 +226,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -249,7 +249,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -272,7 +272,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -295,7 +295,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -318,7 +318,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -341,7 +341,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -364,7 +364,7 @@ public class GenericJavaManyToOneMapping2_0Tests createTestEntityWithManyToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping manyToOneMapping = (ManyToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -388,7 +388,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -410,7 +410,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -430,7 +430,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -459,7 +459,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -486,7 +486,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); DerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); @@ -526,7 +526,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); DerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); @@ -563,7 +563,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(((ManyToOneMapping2_0) contextAttribute.getMapping()). @@ -609,7 +609,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); @@ -642,7 +642,7 @@ public class GenericJavaManyToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java index 40dffab3ee..129702223e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToManyMapping2_0Tests.java @@ -38,7 +38,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; @@ -394,7 +394,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -418,7 +418,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -440,7 +440,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -464,7 +464,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -488,7 +488,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -512,7 +512,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -536,7 +536,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -560,7 +560,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -584,7 +584,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -608,7 +608,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -636,7 +636,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -679,7 +679,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -720,7 +720,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -729,7 +729,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -738,7 +738,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -752,7 +752,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -770,7 +770,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -781,7 +781,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -801,7 +801,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -826,7 +826,7 @@ public class GenericJavaOneToManyMapping2_0Tests this.createTestEntityWithValidOneToManyMapping(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -855,7 +855,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); @@ -894,7 +894,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); @@ -923,7 +923,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = @@ -946,7 +946,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping2_0 = (OneToManyMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = oneToManyMapping2_0.getCandidateMapKeyNames().iterator(); @@ -972,7 +972,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); @@ -1009,7 +1009,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); @@ -1035,7 +1035,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", oneToManyMapping.getDefaultMapKeyClass()); @@ -1049,7 +1049,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultMapKeyClass()); @@ -1059,7 +1059,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", oneToManyMapping.getMapKeyClass()); @@ -1176,7 +1176,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.getRelationship().setStrategyToMappedBy(); oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employee"); @@ -1205,7 +1205,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -1231,7 +1231,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); @@ -1257,7 +1257,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); @@ -1287,7 +1287,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); ((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true); @@ -1309,7 +1309,7 @@ public class GenericJavaOneToManyMapping2_0Tests JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); @@ -1351,7 +1351,7 @@ public class GenericJavaOneToManyMapping2_0Tests JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); @@ -1796,7 +1796,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1824,7 +1824,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1850,7 +1850,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1874,7 +1874,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1900,7 +1900,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ListIterator<? extends SpecifiedJoinColumn> specifiedMapKeyJoinColumns = oneToManyMapping.getSpecifiedMapKeyJoinColumns().iterator(); @@ -1969,7 +1969,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(0, oneToManyMapping.getSpecifiedMapKeyJoinColumnsSize()); @@ -1987,7 +1987,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(1, oneToManyMapping.getMapKeyJoinColumnsSize()); @@ -2007,7 +2007,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2029,7 +2029,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2051,7 +2051,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2098,7 +2098,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.addSpecifiedMapKeyJoinColumn(0).setSpecifiedName("FOO"); @@ -2140,7 +2140,7 @@ public class GenericJavaOneToManyMapping2_0Tests createTestEntityWithEntityKeyOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -2197,7 +2197,7 @@ public class GenericJavaOneToManyMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertTrue(oneToManyMapping.getDefaultMapKeyJoinColumn().isVirtual()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java index 069869bec6..5aeb20faf8 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaOneToOneMapping2_0Tests.java @@ -28,10 +28,10 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TransientMapping; import org.eclipse.jpt.jpa.core.context.VersionMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; @@ -292,7 +292,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -315,7 +315,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -336,7 +336,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -359,7 +359,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -382,7 +382,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -405,7 +405,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -428,7 +428,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -451,7 +451,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -474,7 +474,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -497,7 +497,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -520,7 +520,7 @@ public class GenericJavaOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -544,7 +544,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -566,7 +566,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -586,7 +586,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -615,7 +615,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -642,7 +642,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); DerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); @@ -682,7 +682,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); DerivedIdentity2_0 derivedIdentity = contextMapping.getDerivedIdentity(); @@ -719,7 +719,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).setValue("foo"); getJpaProject().synchronizeContextModel(); @@ -757,7 +757,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -798,7 +798,7 @@ public class GenericJavaOneToOneMapping2_0Tests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -839,7 +839,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -848,7 +848,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -857,7 +857,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -871,7 +871,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -889,7 +889,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntityWithValidOneToOneMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(Boolean.FALSE, this.getOrphanRemovalOf(oneToOneMapping).getSpecifiedOrphanRemoval()); @@ -899,7 +899,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -920,7 +920,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -945,7 +945,7 @@ public class GenericJavaOneToOneMapping2_0Tests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -976,7 +976,7 @@ public class GenericJavaOneToOneMapping2_0Tests JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) mapping.getRelationship(); @@ -1036,7 +1036,7 @@ public class GenericJavaOneToOneMapping2_0Tests JavaResourceField resourceField = ((JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE)).getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) mapping.getRelationship(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java index c785761582..61fb2ab3bf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentAttribute2_0Tests.java @@ -16,8 +16,8 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.Generic2_0ContextModelTestCase; @@ -98,12 +98,12 @@ public class GenericJavaPersistentAttribute2_0Tests extends Generic2_0ContextMod createTestEntitySpecifiedAccessField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute namePersistentAttribute = getJavaPersistentType().getAttributeNamed("name"); + SpecifiedPersistentAttribute namePersistentAttribute = getJavaPersistentType().getAttributeNamed("name"); assertEquals(AccessType.FIELD, namePersistentAttribute.getAccess()); assertEquals(AccessType.FIELD, namePersistentAttribute.getDefaultAccess()); assertEquals(null, namePersistentAttribute.getSpecifiedAccess()); - ModifiablePersistentAttribute idPersistentAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idPersistentAttribute = getJavaPersistentType().getAttributeNamed("id"); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, idPersistentAttribute.getMappingKey()); assertEquals(AccessType.PROPERTY, idPersistentAttribute.getAccess()); assertEquals(AccessType.PROPERTY, idPersistentAttribute.getDefaultAccess()); @@ -114,12 +114,12 @@ public class GenericJavaPersistentAttribute2_0Tests extends Generic2_0ContextMod createTestEntitySpecifiedAccessProperty(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute namePersistentAttribute = getJavaPersistentType().getAttributeNamed("name"); + SpecifiedPersistentAttribute namePersistentAttribute = getJavaPersistentType().getAttributeNamed("name"); assertEquals(AccessType.FIELD, namePersistentAttribute.getAccess()); assertEquals(AccessType.FIELD, namePersistentAttribute.getDefaultAccess()); assertEquals(AccessType.FIELD, namePersistentAttribute.getSpecifiedAccess()); - ModifiablePersistentAttribute idPersistentAttribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute idPersistentAttribute = getJavaPersistentType().getAttributeNamed("id"); assertEquals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, idPersistentAttribute.getMappingKey()); assertEquals(AccessType.PROPERTY, idPersistentAttribute.getAccess()); assertEquals(AccessType.PROPERTY, idPersistentAttribute.getDefaultAccess()); @@ -130,7 +130,7 @@ public class GenericJavaPersistentAttribute2_0Tests extends Generic2_0ContextMod createTestEntityForDerivedId(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaModifiablePersistentAttribute id = getJavaPersistentType().getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute id = getJavaPersistentType().getAttributeNamed("id"); assertEquals(id.getMappingKey(), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); id.getResourceAttribute().addAnnotation(JPA.ID); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java index 1f473cb300..8a1e16ceac 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaPersistentType2_0Tests.java @@ -23,9 +23,9 @@ import org.eclipse.jpt.common.utility.reference.BooleanReference; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; @@ -297,8 +297,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(AccessType.PROPERTY, getJavaPersistentType().getAccess()); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute javaPersistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = attributes.next(); assertEquals("name", javaPersistentAttribute.getName()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMapping().getKey()); @@ -317,8 +317,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes assertEquals(AccessType.FIELD, getJavaPersistentType().getAccess()); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute javaPersistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = attributes.next(); assertEquals("id", javaPersistentAttribute.getName()); assertEquals(AccessType.FIELD, javaPersistentAttribute.getAccess()); assertEquals(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, javaPersistentAttribute.getMappingKey()); @@ -731,7 +731,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes public void testAttributes() throws Exception { createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); assertEquals("id", attributes.next().getName()); assertFalse(attributes.hasNext()); @@ -741,9 +741,9 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes createTestEntityAnnotatedFieldAndMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute attribute = attributes.next(); + JavaSpecifiedPersistentAttribute attribute = attributes.next(); assertEquals("id", attribute.getName()); assertTrue(attribute.getAccessor() instanceof FieldAccessor); attribute = attributes.next(); @@ -773,7 +773,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes createTestEntityAnnotatedMethod(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("id"); + SpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("id"); assertEquals("id", attribute.getName()); assertNull(getJavaPersistentType().getAttributeNamed("name")); @@ -784,7 +784,7 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("name"); + SpecifiedPersistentAttribute attribute = getJavaPersistentType().getAttributeNamed("name"); assertEquals("name", attribute.getName()); @@ -801,9 +801,9 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes ICompilationUnit testType = createTestEntityAnnotatedField(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute idAttribute = attributes.next(); - JavaModifiablePersistentAttribute nameAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute idAttribute = attributes.next(); + JavaSpecifiedPersistentAttribute nameAttribute = attributes.next(); assertEquals("id", idAttribute.getName()); @@ -813,8 +813,8 @@ public class GenericJavaPersistentType2_0Tests extends Generic2_0ContextModelTes idField.rename("id2", false, null); attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute nameAttribute2 = attributes.next(); - JavaModifiablePersistentAttribute id2Attribute = attributes.next(); + JavaSpecifiedPersistentAttribute nameAttribute2 = attributes.next(); + JavaSpecifiedPersistentAttribute id2Attribute = attributes.next(); assertNotSame(idAttribute, id2Attribute); assertEquals("id2", id2Attribute.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java index 071725f508..643988cf22 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/java/GenericJavaVersionMapping2_0Tests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.TransientMapping; @@ -77,7 +77,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -103,7 +103,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertFalse(versionMapping.isDefault()); versionMapping.getColumn().setSpecifiedName("FOO"); @@ -128,7 +128,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -154,7 +154,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -179,7 +179,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -204,7 +204,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -229,7 +229,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -254,7 +254,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -279,7 +279,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -304,7 +304,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); @@ -329,7 +329,7 @@ public class GenericJavaVersionMapping2_0Tests extends Generic2_0ContextModelTes createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCascade2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCascade2_0Tests.java index 366066ece1..20b8f72bf8 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCascade2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCascade2_0Tests.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.tests.internal.jpa2.context.orm; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -41,7 +41,7 @@ public class GenericOrmCascade2_0Tests extends Generic2_0ContextModelTestCase public void testUpdateCascadeDetach() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); Cascade2_0 cascade = (Cascade2_0) ormOneToOneMapping.getCascade(); @@ -68,7 +68,7 @@ public class GenericOrmCascade2_0Tests extends Generic2_0ContextModelTestCase public void testModifyCascadeDetach() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OrmOneToOneMapping ormOneToOneMapping = (OrmOneToOneMapping) ormPersistentAttribute.getMapping(); XmlOneToOne oneToOne = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java index f8fe0af14d..4d7c459f4e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmCollectionTable2_0Tests.java @@ -18,10 +18,10 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmUniqueConstraint; @@ -81,7 +81,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUpdateSpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -114,7 +114,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testModifySpecifiedName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -152,7 +152,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes assertEquals(TYPE_NAME + "_id", virtualJoinColumn.getDefaultName()); assertEquals("id", virtualJoinColumn.getDefaultReferencedColumnName()); - JavaModifiablePersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) javaPersistentAttribute.getMapping(); JavaCollectionTable2_0 javaCollectionTable = javaElementCollectionMapping.getCollectionTable(); javaCollectionTable.setSpecifiedName("FOO"); @@ -176,7 +176,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmCollectionTable2_0 ormCollectionTable = ormElementCollectionMapping.getCollectionTable(); @@ -217,7 +217,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUpdateSpecifiedSchema() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -249,7 +249,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testModifySpecifiedSchema() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -272,7 +272,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUpdateSpecifiedCatalog() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -304,7 +304,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testModifySpecifiedCatalog() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -327,7 +327,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testAddSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -366,7 +366,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testRemoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -395,7 +395,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testMoveSpecifiedJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -435,7 +435,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUpdateJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -489,7 +489,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUniqueConstraints() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -518,7 +518,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUniqueConstraintsSize() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -542,7 +542,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testAddUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -565,7 +565,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testAddUniqueConstraint2() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -588,7 +588,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testRemoveUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -635,7 +635,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testMoveUniqueConstraint() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -677,7 +677,7 @@ public class GenericOrmCollectionTable2_0Tests extends Generic2_0ContextModelTes public void testUpdateUniqueConstraints() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 resourceElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java index ef30d4077a..251b32f429 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmElementCollectionMapping2_0Tests.java @@ -40,7 +40,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; @@ -294,7 +294,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -315,7 +315,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -342,7 +342,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); ormElementCollectionMapping.setName("foo"); assertEquals("foo", ormElementCollectionMapping.getName()); @@ -405,7 +405,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormElementCollectionMapping.getName()); @@ -417,7 +417,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -434,7 +434,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToVersionMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -451,7 +451,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToTransientMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -468,7 +468,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToEmbeddedMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -485,7 +485,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToEmbeddedIdMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -502,7 +502,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToManyToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -520,7 +520,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToOneToManyMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -538,7 +538,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToManyToOneMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -556,7 +556,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMorphToBasicMapping() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -574,7 +574,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateSpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -599,7 +599,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifySpecifiedFetch() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -624,7 +624,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateSpecifiedTargetClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -645,7 +645,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifySpecifiedTargetClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -670,7 +670,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.EMBEDDABLE_TYPE, elementCollectionMapping.getValueType()); @@ -682,7 +682,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -694,7 +694,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.NO_TYPE, elementCollectionMapping.getValueType()); @@ -709,7 +709,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -719,7 +719,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -785,7 +785,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifyMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 xmlElementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -869,7 +869,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -922,7 +922,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifyMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -943,7 +943,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testOrderColumnDefaults() throws Exception { createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable(); @@ -966,7 +966,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testVirtualOrderColumn() throws Exception { createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable(); @@ -1049,7 +1049,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = addressesVirtualMapping.getValueColumn(); @@ -1123,7 +1123,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMoveSpecifiedAttributeOverride() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1163,7 +1163,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateAttributeOverrides() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1220,7 +1220,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); ormElementCollectionMapping.setName("foo"); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); @@ -1405,7 +1405,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex createTestEntityWithValidMapElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -1487,7 +1487,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateSpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1512,7 +1512,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifySpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1538,7 +1538,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateSpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1567,7 +1567,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testModifySpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1593,7 +1593,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testAddSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1629,7 +1629,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testRemoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1655,7 +1655,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testMoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1691,7 +1691,7 @@ public class GenericOrmElementCollectionMapping2_0Tests extends Generic2_0Contex public void testUpdateMapKeyJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 ormElementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java index f8f70e9062..16fad582b4 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmEmbeddedMapping2_0Tests.java @@ -57,7 +57,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; @@ -354,7 +354,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testUpdateName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -375,7 +375,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testModifyName() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -456,7 +456,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testMoveSpecifiedAttributeOverride() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -496,7 +496,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testUpdateAttributeOverrides() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); XmlEmbedded embeddedResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getEmbeddeds().get(0); @@ -554,7 +554,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); ormEmbeddedMapping.setName("foo"); OrmAttributeOverrideContainer attributeOverrideContainer = ormEmbeddedMapping.getAttributeOverrideContainer(); @@ -778,7 +778,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEmbeddedMapping ormEmbeddedMapping = (OrmEmbeddedMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormEmbeddedMapping.getName()); @@ -822,7 +822,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToIdMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -843,7 +843,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToVersionMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -864,7 +864,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToTransientMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -885,7 +885,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToBasicMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -906,7 +906,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToEmbeddedIdMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -930,7 +930,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToOneToOneMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -951,7 +951,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToOneToManyMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -972,7 +972,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToManyToOneMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -993,7 +993,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes public void testEmbeddedMorphToManyToManyMapping() throws Exception { createTestEntityEmbeddedMappingAttributeOverrides(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); EmbeddedMapping embeddedMapping = (EmbeddedMapping) ormPersistentAttribute.getMapping(); assertFalse(embeddedMapping.isDefault()); @@ -1018,7 +1018,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1087,7 +1087,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1152,7 +1152,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1178,7 +1178,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1198,7 +1198,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1226,7 +1226,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1247,7 +1247,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1270,7 +1270,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1304,7 +1304,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1341,7 +1341,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1400,7 +1400,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); OrmAssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); @@ -1433,7 +1433,7 @@ public class GenericOrmEmbeddedMapping2_0Tests extends Generic2_0ContextModelTes addXmlClassRef(FULLY_QUALIFIED_EMBEDDABLE_TYPE_NAME); addXmlClassRef(PACKAGE_NAME_ + "Address"); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myEmbedded"), MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); OrmEmbeddedMapping2_0 embeddedMapping = (OrmEmbeddedMapping2_0) ormPersistentAttribute.getMapping(); AssociationOverrideContainer overrideContainer = embeddedMapping.getAssociationOverrideContainer(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java index 5a23d61ec2..0bdd166b4c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToManyMapping2_0Tests.java @@ -30,7 +30,7 @@ import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; @@ -336,7 +336,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testUpdateMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -402,7 +402,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testModifyMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany xmlManyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -490,7 +490,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testUpdateMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -543,7 +543,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testModifyMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -566,13 +566,13 @@ public class GenericOrmManyToManyMapping2_0Tests createTestEntityPrintJob(); OrmPersistentType printQueuePersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); - OrmModifiablePersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping jobsMapping = (OrmManyToManyMapping) jobsPersistentAttribute.getMapping(); jobsMapping.getRelationship().setStrategyToMappedBy(); jobsMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("queues"); OrmPersistentType printJobPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping queuesMapping = (OrmManyToManyMapping) queuesPersistentAttribute.getMapping(); Orderable2_0 jobsOrderable = ((Orderable2_0) jobsMapping.getOrderable()); @@ -626,11 +626,11 @@ public class GenericOrmManyToManyMapping2_0Tests createTestEntityPrintJob(); OrmPersistentType printQueuePersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); - OrmModifiablePersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping jobsMapping = (OrmManyToManyMapping) jobsPersistentAttribute.getMapping(); OrmPersistentType printJobPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping queuesMapping = (OrmManyToManyMapping) queuesPersistentAttribute.getMapping(); Orderable2_0 jobsOrderable = ((Orderable2_0) jobsMapping.getOrderable()); @@ -815,7 +815,7 @@ public class GenericOrmManyToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 addressesVirtualMapping = (OrmCollectionMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -954,7 +954,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testUpdateSpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -979,7 +979,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testModifySpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1005,7 +1005,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testUpdateSpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1034,7 +1034,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testModifySpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1060,7 +1060,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testAddSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping2_0 ormManyToManyMapping = (ManyToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1096,7 +1096,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testRemoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping2_0 ormManyToManyMapping = (ManyToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1122,7 +1122,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testMoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping2_0 ormManyToManyMapping = (ManyToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1158,7 +1158,7 @@ public class GenericOrmManyToManyMapping2_0Tests public void testUpdateMapKeyJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ManyToManyMapping2_0 ormManyToManyMapping = (ManyToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java index 918c174b53..f93b65a8fb 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmManyToOneMapping2_0Tests.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -389,7 +389,7 @@ public class GenericOrmManyToOneMapping2_0Tests public void testMorphMapping() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); OrmPersistentType contextType = getEntityMappings().getPersistentType(FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute contextAttribute = (OrmModifiablePersistentAttribute) contextType.getAttributeNamed("manyToOne"); + OrmSpecifiedPersistentAttribute contextAttribute = (OrmSpecifiedPersistentAttribute) contextType.getAttributeNamed("manyToOne"); XmlEntity resourceEntity = (XmlEntity) contextType.getMapping().getXmlTypeMapping(); XmlManyToOne resourceManyToOne = resourceEntity.getAttributes().getManyToOnes().get(0); @@ -480,7 +480,7 @@ public class GenericOrmManyToOneMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); ManyToOneMapping2_0 ormManyToOneMapping = (ManyToOneMapping2_0) ormPersistentAttribute.getMapping(); ((ManyToOneRelationship2_0) ormManyToOneMapping.getRelationship()).setStrategyToJoinTable(); OrmJoinTable ormJoinTable = ((OrmManyToOneRelationship2_0) ormManyToOneMapping.getRelationship()).getJoinTableStrategy().getJoinTable(); @@ -652,7 +652,7 @@ public class GenericOrmManyToOneMapping2_0Tests assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - OrmModifiablePersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmManyToOneMapping ormManyToOneMapping = (OrmManyToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java index e90b04186e..188dd7c62b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToManyMapping2_0Tests.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; @@ -373,7 +373,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateSpecifiedOrphanRemoval() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToManyMapping); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -394,7 +394,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testModifySpecifiedOrphanRemoval() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToManyMapping); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -415,7 +415,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -481,7 +481,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testModifyMapKey() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping ormOneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -568,7 +568,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -621,7 +621,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testModifyMapKeyClass() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -645,7 +645,7 @@ public class GenericOrmOneToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping oneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); oneToManyMapping.getRelationship().setStrategyToMappedBy(); oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("queue"); @@ -678,7 +678,7 @@ public class GenericOrmOneToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping oneToManyMapping = (OneToManyMapping) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = ((Orderable2_0) oneToManyMapping.getOrderable()); @@ -838,7 +838,7 @@ public class GenericOrmOneToManyMapping2_0Tests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 addressesVirtualMapping = (OneToManyMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -1245,7 +1245,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateSpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1270,7 +1270,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testModifySpecifiedEnumerated() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1296,7 +1296,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateSpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1325,7 +1325,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testModifySpecifiedTemporal() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1351,7 +1351,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testAddSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1387,7 +1387,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testRemoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1413,7 +1413,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testMoveSpecifiedMapKeyJoinColumn() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1449,7 +1449,7 @@ public class GenericOrmOneToManyMapping2_0Tests public void testUpdateMapKeyJoinColumns() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java index 63666ebfc6..ff62bd1402 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmOneToOneMapping2_0Tests.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -451,7 +451,7 @@ public class GenericOrmOneToOneMapping2_0Tests public void testMorphMapping() throws Exception { createTestEntityWithIdDerivedIdentity(); OrmPersistentType contextType = getEntityMappings().getPersistentType(FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute contextAttribute = (OrmModifiablePersistentAttribute) contextType.getAttributeNamed("oneToOne"); + OrmSpecifiedPersistentAttribute contextAttribute = (OrmSpecifiedPersistentAttribute) contextType.getAttributeNamed("oneToOne"); XmlEntity resourceEntity = (XmlEntity) contextType.getMapping().getXmlTypeMapping(); XmlOneToOne resourceOneToOne = resourceEntity.getAttributes().getOneToOnes().get(0); @@ -580,7 +580,7 @@ public class GenericOrmOneToOneMapping2_0Tests public void testUpdateSpecifiedOrphanRemoval() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToOneMapping); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -601,7 +601,7 @@ public class GenericOrmOneToOneMapping2_0Tests public void testModifySpecifiedOrphanRemoval() throws Exception { createTestType(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToOneMapping); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -679,7 +679,7 @@ public class GenericOrmOneToOneMapping2_0Tests createTestEntityWithValidOneToOneMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); ((OneToOneRelationship2_0) ormOneToOneMapping.getRelationship()).setStrategyToJoinTable(); @@ -955,7 +955,7 @@ public class GenericOrmOneToOneMapping2_0Tests assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.addToXml(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java index 148e250957..35b122d48e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentAttribute2_0Tests.java @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; @@ -146,7 +146,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -155,7 +155,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -180,7 +180,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertEquals(null, specifiedOrmPersistentAttribute.getSpecifiedAccess()); assertEquals(AccessType.PROPERTY, specifiedOrmPersistentAttribute.getAccess()); @@ -194,7 +194,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -222,7 +222,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(2, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertTrue(specifiedOrmPersistentAttribute.getMapping() instanceof OrmOneToOneMapping); @@ -233,7 +233,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -256,7 +256,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -291,7 +291,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.removeFromXml(); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); @@ -340,7 +340,7 @@ public class GenericOrmPersistentAttribute2_0Tests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); //virtual orm attribute, access type matches java : FIELD, name matches java assertTrue(ormPersistentAttribute.isVirtual()); @@ -362,7 +362,7 @@ public class GenericOrmPersistentAttribute2_0Tests //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java //verify both the property java resource attribute and the field java resource attribute are used in orm //because the field is annotated and property is specified - ((OrmModifiablePersistentAttribute) ormPersistentAttribute).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) ormPersistentAttribute).removeFromXml(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); @@ -382,7 +382,7 @@ public class GenericOrmPersistentAttribute2_0Tests ormPersistentType.setSpecifiedAccess(null);//default access will be field ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - OrmModifiablePersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); ormPersistentAttribute2.getMapping().setName("id2"); assertEquals(null, ormPersistentAttribute2.getJavaPersistentAttribute()); @@ -406,7 +406,7 @@ public class GenericOrmPersistentAttribute2_0Tests ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); OrmPersistentAttribute ormFieldAttribute = attributes.next(); OrmPersistentAttribute ormPropertyAttribute = attributes.next(); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertEquals(AccessType.FIELD, ormFieldAttribute.getAccess()); assertEquals(AccessType.PROPERTY, ormPropertyAttribute.getAccess()); @@ -427,7 +427,7 @@ public class GenericOrmPersistentAttribute2_0Tests assertTrue(ormPropertyAttribute.getJavaPersistentAttribute().getResourceAttribute().getAstNodeType() == AstNodeType.METHOD); assertTrue(javaPersistentAttribute.getResourceAttribute().getAstNodeType() == AstNodeType.FIELD); - ((OrmModifiablePersistentAttribute) ormPropertyAttribute).setSpecifiedAccess(AccessType.FIELD); + ((OrmSpecifiedPersistentAttribute) ormPropertyAttribute).setSpecifiedAccess(AccessType.FIELD); ormPropertyAttribute = ormPersistentType.getAttributeNamed("id"); assertFalse(ormPropertyAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPropertyAttribute.getAccess()); @@ -442,7 +442,7 @@ public class GenericOrmPersistentAttribute2_0Tests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); @@ -475,7 +475,7 @@ public class GenericOrmPersistentAttribute2_0Tests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); @@ -508,7 +508,7 @@ public class GenericOrmPersistentAttribute2_0Tests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); @@ -518,7 +518,7 @@ public class GenericOrmPersistentAttribute2_0Tests OrmPersistentAttribute nameOrmPersistentAttribute = ormPersistentType.getAttributeNamed("name"); - JavaModifiablePersistentAttribute nameJavaPersistentAttribute = javaPersistentType.getAttributeNamed("name"); + JavaSpecifiedPersistentAttribute nameJavaPersistentAttribute = javaPersistentType.getAttributeNamed("name"); assertTrue(nameOrmPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, nameOrmPersistentAttribute.getAccess()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java index 3c2cf395ee..17594ac2d8 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/jpa2/context/orm/GenericOrmPersistentType2_0Tests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; @@ -248,7 +248,7 @@ public class GenericOrmPersistentType2_0Tests assertFalse(virtualAttributes.hasNext()); - OrmModifiablePersistentAttribute specifiedAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedAttribute.getName()); assertEquals(AccessType.PROPERTY, specifiedAttribute.getSpecifiedAccess()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java index d61a01d1b6..ff20bdb3ca 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.core.tests/src/org/eclipse/jpt/jpa/core/tests/internal/platform/JpaPlatformTests.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaProject;
import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping;
import org.eclipse.jpt.jpa.core.internal.facet.JpaFacetDataModelProperties;
import org.eclipse.jpt.jpa.core.internal.facet.JpaFacetInstallDataModelProvider;
@@ -116,7 +116,7 @@ public class JpaPlatformTests createTestEntity();
addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME);
- JavaModifiablePersistentAttribute javaAttribute = this.getJavaPersistentType().getAttributeNamed("name");
+ JavaSpecifiedPersistentAttribute javaAttribute = this.getJavaPersistentType().getAttributeNamed("name");
javaAttribute.setMappingKey(JavaTestAttributeMapping.TEST_ATTRIBUTE_MAPPING_KEY);
JavaAttributeMapping mapping = javaAttribute.getMapping();
assertTrue(mapping instanceof JavaTestAttributeMapping);
diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java index d1ff31dd44..70264defa3 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaElementCollectionMappingTests.java @@ -33,7 +33,7 @@ import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; @@ -373,7 +373,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -391,7 +391,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -407,7 +407,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -425,7 +425,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -443,7 +443,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -461,7 +461,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -479,7 +479,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -497,7 +497,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -515,7 +515,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -533,7 +533,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -551,7 +551,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -578,7 +578,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -604,7 +604,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //targetEntity not in the persistence unit, default still set, handled by validation @@ -634,7 +634,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -646,7 +646,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -658,7 +658,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultTargetClass()); @@ -670,7 +670,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getDefaultTargetClass()); @@ -681,7 +681,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(PACKAGE_NAME + ".Address", elementCollectionMapping.getTargetClass()); @@ -701,7 +701,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target embeddable not in the persistence unit @@ -733,7 +733,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); //target is a basic type, so resolved target embeddable is null @@ -744,7 +744,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -779,7 +779,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -809,7 +809,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.EMBEDDABLE_TYPE, elementCollectionMapping.getValueType()); @@ -820,7 +820,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.NO_TYPE, elementCollectionMapping.getValueType()); @@ -834,7 +834,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestTargetEmbeddableAddress(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -844,7 +844,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -884,7 +884,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -914,7 +914,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = @@ -935,7 +935,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping2_0 = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = elementCollectionMapping2_0.getCandidateMapKeyNames().iterator(); @@ -959,7 +959,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -999,7 +999,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -1026,7 +1026,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getDefaultMapKeyClass()); @@ -1040,7 +1040,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithGenericBasicElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getDefaultMapKeyClass()); @@ -1050,7 +1050,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", elementCollectionMapping.getMapKeyClass()); @@ -1066,7 +1066,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithGenericEmbeddableElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); Orderable2_0 orderable = ((Orderable2_0) elementCollectionMapping.getOrderable()); @@ -1090,7 +1090,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getValueColumn().getSpecifiedName()); @@ -1527,7 +1527,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyColumn().getSpecifiedName()); @@ -2098,7 +2098,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2126,7 +2126,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2152,7 +2152,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2176,7 +2176,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithValidGenericMapElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getMapKeyConverter().getType()); @@ -2208,7 +2208,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests resourceField.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, elementCollectionMapping.getConverter().getType()); @@ -2218,7 +2218,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMappingWithConvert(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, elementCollectionMapping.getConverter().getType()); @@ -2229,7 +2229,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getConverter().getType()); @@ -2250,7 +2250,7 @@ public class EclipseLink2_0JavaElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(elementCollectionMapping.getConverter().getType()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToManyMappingTests.java index 7405455a7f..3068fe61cc 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToManyMappingTests.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.core.context.EnumType; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.JoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; @@ -346,7 +346,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithJoinFetchManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -394,7 +394,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithJoinFetchManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -444,7 +444,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -487,7 +487,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -524,7 +524,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -563,7 +563,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping = (ManyToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -592,7 +592,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = @@ -615,7 +615,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping manyToManyMapping2_0 = (ManyToManyMapping) persistentAttribute.getMapping(); Iterator<String> mapKeyNames = manyToManyMapping2_0.getCandidateMapKeyNames().iterator(); @@ -641,7 +641,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -680,7 +680,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -707,7 +707,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getDefaultMapKeyClass()); @@ -721,7 +721,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getDefaultMapKeyClass()); @@ -731,7 +731,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.Integer", manyToManyMapping.getMapKeyClass()); @@ -871,7 +871,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); manyToManyMapping.getRelationship().setStrategyToMappedBy(); manyToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employees"); @@ -902,7 +902,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToManyMapping2_0 manyToManyMapping = (ManyToManyMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -1308,7 +1308,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1336,7 +1336,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1362,7 +1362,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); @@ -1386,7 +1386,7 @@ public class EclipseLink2_0JavaManyToManyMappingTests createTestEntityWithValidGenericMapManyToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaCollectionMapping2_0 manyToManyMapping = (JavaCollectionMapping2_0) persistentAttribute.getMapping(); assertNull(manyToManyMapping.getMapKeyConverter().getType()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToOneMappingTests.java index 1577b32eee..c7ff138861 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaManyToOneMappingTests.java @@ -16,8 +16,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; @@ -116,7 +116,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -139,7 +139,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -160,7 +160,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); MapsId2_0Annotation annotation = @@ -187,7 +187,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("address"); ManyToOneMapping2_0 contextMapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -215,7 +215,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("manyToOne"); ((MapsId2_0Annotation) resourceField.getAnnotation(JPA2_0.MAPS_ID)).setValue("foo"); getJpaProject().synchronizeContextModel(); @@ -251,7 +251,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); @@ -285,7 +285,7 @@ public class EclipseLink2_0JavaManyToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); ManyToOneMapping2_0 mapping = (ManyToOneMapping2_0) contextAttribute.getMapping(); ManyToOneRelationship2_0 rel = (ManyToOneRelationship2_0) mapping.getRelationship(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java index e672957e17..8d82a6614e 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToManyMappingTests.java @@ -30,7 +30,7 @@ import org.eclipse.jpt.jpa.core.context.EnumType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.JoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; @@ -335,7 +335,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -344,7 +344,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToManyMapping).isDefaultOrphanRemoval()); } @@ -353,7 +353,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -368,7 +368,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -387,7 +387,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntityWithValidOneToManyMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -398,7 +398,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -419,7 +419,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -445,7 +445,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); @@ -475,7 +475,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -514,7 +514,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping oneToManyMapping = (OneToManyMapping) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -589,7 +589,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -628,7 +628,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -655,7 +655,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEmbeddableState(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.String", oneToManyMapping.getDefaultMapKeyClass()); @@ -669,7 +669,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidOneToManyMappingOrphanRemovalSpecified(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getDefaultMapKeyClass()); @@ -679,7 +679,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertEquals("java.lang.String", oneToManyMapping.getMapKeyClass()); @@ -796,7 +796,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); oneToManyMapping.getRelationship().setStrategyToMappedBy(); oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("employee"); @@ -826,7 +826,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyColumn().getSpecifiedName()); @@ -853,7 +853,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); @@ -879,7 +879,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); @@ -910,7 +910,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); addXmlClassRef(PACKAGE_NAME + ".Address"); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); ((JoinColumnRelationship) oneToManyMapping.getRelationship()).setStrategyToJoinColumn(); ((Orderable2_0) oneToManyMapping.getOrderable()).setOrderColumnOrdering(true); @@ -933,7 +933,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); @@ -976,7 +976,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 mapping = (OneToManyMapping2_0) contextAttribute.getMapping(); OneToManyRelationship2_0 rel = (OneToManyRelationship2_0) mapping.getRelationship(); @@ -1427,7 +1427,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1455,7 +1455,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1481,7 +1481,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); @@ -1505,7 +1505,7 @@ public class EclipseLink2_0JavaOneToManyMappingTests createTestEntityWithValidGenericMapOneToManyMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) persistentAttribute.getMapping(); assertNull(oneToManyMapping.getMapKeyConverter().getType()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java index 4abb2cb315..094a129b92 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLink2_0JavaOneToOneMappingTests.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; @@ -270,7 +270,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -293,7 +293,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA.ID)); @@ -314,7 +314,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNotNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -344,7 +344,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("address"); OneToOneMapping2_0 contextMapping = (OneToOneMapping2_0) contextAttribute.getMapping(); assertNull(resourceField.getAnnotation(JPA2_0.MAPS_ID)); @@ -372,7 +372,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); JavaPersistentType contextType = getJavaPersistentType(); - JavaModifiablePersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); + JavaSpecifiedPersistentAttribute contextAttribute = contextType.getAttributeNamed("oneToOne"); assertNotNull(resourceField.getAnnotation(JPA.ID)); assertTrue(((OneToOneMapping2_0) contextAttribute.getMapping()). @@ -426,7 +426,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -467,7 +467,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests addXmlClassRef(PACKAGE_NAME + ".Address"); addXmlClassRef(PACKAGE_NAME + ".State"); - ModifiablePersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = (getJavaPersistentType()).getAttributes().iterator().next(); OneToOneMapping oneToOneMapping = (OneToOneMapping) persistentAttribute.getMapping(); Iterator<String> attributeNames = @@ -508,7 +508,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -517,7 +517,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(false, this.getOrphanRemovalOf(oneToOneMapping).isDefaultOrphanRemoval()); } @@ -526,7 +526,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -540,7 +540,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -559,7 +559,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntityWithValidOneToOneMappingOrphanRemovalSpecified(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); assertEquals(Boolean.FALSE, this.getOrphanRemovalOf(oneToOneMapping).getSpecifiedOrphanRemoval()); @@ -569,7 +569,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -590,7 +590,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); assertNull(mappingsOrphanRemoval.getSpecifiedOrphanRemoval()); @@ -615,7 +615,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests this.createTestEntity(); this.addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 oneToOneMapping = (OneToOneMapping2_0) persistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToOneMapping); @@ -648,7 +648,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) mapping.getRelationship(); @@ -709,7 +709,7 @@ public class EclipseLink2_0JavaOneToOneMappingTests JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToOneAnnotation annotation = (OneToOneAnnotation) resourceField.getAnnotation(JPA.ONE_TO_ONE); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); OneToOneMapping2_0 mapping = (OneToOneMapping2_0) contextAttribute.getMapping(); OneToOneRelationship2_0 rel = (OneToOneRelationship2_0) mapping.getRelationship(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java index 7c5d3d2634..1344e59407 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaBasicMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.context.BasicMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -125,7 +125,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes resourceField.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, basicMapping.getConverter().getType()); @@ -135,7 +135,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithConvert(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, basicMapping.getConverter().getType()); @@ -146,7 +146,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -167,7 +167,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); @@ -194,7 +194,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithMutableBasic(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = basicMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -228,7 +228,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithMutableBasic(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = basicMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -257,7 +257,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithMutableBasic(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = basicMapping.getMutable(); assertTrue(mutable.isDefaultMutable()); @@ -279,7 +279,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithMutableBasicDate(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = basicMapping.getMutable(); assertFalse(mutable.isDefaultMutable()); @@ -307,7 +307,7 @@ public class EclipseLinkJavaBasicMappingTests extends EclipseLinkContextModelTes createTestEntityWithMutableBasic(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkBasicMapping basicMapping = (EclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = basicMapping.getMutable(); assertTrue(mutable.isMutable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java index 5652128283..0f1abfb510 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConvertTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.context.BasicMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.resource.java.EclipseLink; @@ -97,7 +97,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase resourceField.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); @@ -110,7 +110,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase createTestEntityWithConvert(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); @@ -121,7 +121,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); basicMapping.setConverter(EclipseLinkConvert.class); EclipseLinkConvert eclipseLinkConvert = (EclipseLinkConvert) basicMapping.getConverter(); @@ -145,7 +145,7 @@ public class EclipseLinkJavaConvertTests extends EclipseLinkContextModelTestCase createTestEntityWithBasicMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); BasicMapping basicMapping = (BasicMapping) persistentAttribute.getMapping(); assertNull(basicMapping.getConverter().getType()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java index 00cf0f1281..3637a6d0be 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaConverterTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCustomConverter; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapping; @@ -75,7 +75,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); @@ -86,7 +86,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); assertEquals("foo", converter.getName()); @@ -116,7 +116,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); @@ -149,7 +149,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); @@ -160,7 +160,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); assertEquals("Foo", converter.getConverterClass()); @@ -190,7 +190,7 @@ public class EclipseLinkJavaConverterTests extends EclipseLinkContextModelTestCa createTestEntityWithConvertAndConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkCustomConverter converter = basicMapping.getConverterContainer().getCustomConverters().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java index cc7227c958..914fedd50f 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaIdMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -126,7 +126,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa resourceField.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, idMapping.getConverter().getType()); @@ -136,7 +136,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithConvert(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, idMapping.getConverter().getType()); @@ -147,7 +147,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); @@ -168,7 +168,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithIdMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getMapping(); assertNull(idMapping.getConverter().getType()); @@ -195,7 +195,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithMutableId(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = idMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -229,7 +229,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithMutableId(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = idMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -258,7 +258,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithMutableId(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = idMapping.getMutable(); assertTrue(mutable.isDefaultMutable()); @@ -280,7 +280,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithMutableIdDate(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = idMapping.getMutable(); assertFalse(mutable.isDefaultMutable()); @@ -308,7 +308,7 @@ public class EclipseLinkJavaIdMappingTests extends EclipseLinkContextModelTestCa createTestEntityWithMutableId(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkIdMapping idMapping = (EclipseLinkIdMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = idMapping.getMutable(); assertTrue(mutable.isMutable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToManyMappingTests.java index a81a0da928..a4e4ca4ec7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToManyMappingTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType; @@ -57,7 +57,7 @@ public class EclipseLinkJavaManyToManyMappingTests extends EclipseLinkContextMod createTestEntityWithJoinFetchManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -106,7 +106,7 @@ public class EclipseLinkJavaManyToManyMappingTests extends EclipseLinkContextMod createTestEntityWithJoinFetchManyToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToOneMappingTests.java index 77c2c7cbed..3daa43eb13 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaManyToOneMappingTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchType; @@ -56,7 +56,7 @@ public class EclipseLinkJavaManyToOneMappingTests extends EclipseLinkContextMode createTestEntityWithJoinFetchManyToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -105,7 +105,7 @@ public class EclipseLinkJavaManyToOneMappingTests extends EclipseLinkContextMode createTestEntityWithJoinFetchManyToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java index 3bf5ed47f4..e6f687689b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaObjectTypeConverterTests.java @@ -16,8 +16,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter; @@ -116,7 +116,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + JavaSpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -127,7 +127,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); assertEquals("foo", converter.getName()); @@ -157,7 +157,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -188,7 +188,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -199,7 +199,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); assertEquals("Foo", converter.getDataType()); @@ -229,7 +229,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -260,7 +260,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -271,7 +271,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); assertEquals("Foo", converter.getObjectType()); @@ -301,7 +301,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -333,7 +333,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -392,7 +392,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -429,7 +429,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -465,7 +465,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -524,7 +524,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -547,7 +547,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -558,7 +558,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); assertEquals("bar", converter.getDefaultObjectValue()); @@ -588,7 +588,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); @@ -619,7 +619,7 @@ public class EclipseLinkJavaObjectTypeConverterTests extends EclipseLinkContextM createTestEntityWithConvertAndObjectTypeConverterConversionValue(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkObjectTypeConverter converter = basicMapping.getConverterContainer().getObjectTypeConverters().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToManyMappingTests.java index 12048a1fc4..37b7bd9b89 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToManyMappingTests.java @@ -17,8 +17,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; @@ -125,7 +125,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithPrivateOwnedOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToManyMapping oneToManyMapping = (EclipseLinkOneToManyMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToManyMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -135,7 +135,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithPrivateOwnedOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToManyMapping oneToManyMapping = (EclipseLinkOneToManyMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToManyMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -156,7 +156,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithPrivateOwnedOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToManyMapping oneToManyMapping = (EclipseLinkOneToManyMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToManyMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -178,7 +178,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithJoinFetchOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -227,7 +227,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithJoinFetchOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -276,7 +276,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToManyMapping mapping = (EclipseLinkOneToManyMapping) contextAttribute.getMapping(); EclipseLinkOneToManyRelationship rel = mapping.getRelationship(); @@ -319,7 +319,7 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); JavaResourceField resourceField = resourceType.getFields().iterator().next(); OneToManyAnnotation annotation = (OneToManyAnnotation) resourceField.getAnnotation(JPA.ONE_TO_MANY); - ModifiablePersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute contextAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToManyMapping mapping = (EclipseLinkOneToManyMapping) contextAttribute.getMapping(); EclipseLinkOneToManyRelationship rel = mapping.getRelationship(); @@ -389,8 +389,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -401,8 +401,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -424,8 +424,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -447,8 +447,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -470,8 +470,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -493,8 +493,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -516,8 +516,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -539,8 +539,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -561,8 +561,8 @@ public class EclipseLinkJavaOneToManyMappingTests extends EclipseLinkContextMode createTestEntityWithDefaultOneToMany(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToOneMappingTests.java index 5ba68af577..c613d7a56c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaOneToOneMappingTests.java @@ -17,8 +17,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.As import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.FetchType; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; @@ -107,7 +107,7 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithPrivateOwnedOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToOneMapping oneToOneMapping = (EclipseLinkOneToOneMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToOneMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -117,7 +117,7 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithPrivateOwnedOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToOneMapping oneToOneMapping = (EclipseLinkOneToOneMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToOneMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -138,7 +138,7 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithPrivateOwnedOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkOneToOneMapping oneToOneMapping = (EclipseLinkOneToOneMapping) persistentAttribute.getMapping(); EclipseLinkPrivateOwned privateOwnable = oneToOneMapping.getPrivateOwned(); assertEquals(true, privateOwnable.isPrivateOwned()); @@ -160,7 +160,7 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithJoinFetchOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -209,7 +209,7 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithJoinFetchOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkRelationshipMapping manyToManyMapping = (EclipseLinkRelationshipMapping) persistentAttribute.getMapping(); EclipseLinkJoinFetch contextJoinFetch = manyToManyMapping.getJoinFetch(); JavaResourceType resourceType = (JavaResourceType) getJpaProject().getJavaResourceType(FULLY_QUALIFIED_TYPE_NAME, AstNodeType.TYPE); @@ -255,8 +255,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -267,8 +267,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -290,8 +290,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -313,8 +313,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -336,8 +336,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -359,8 +359,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -382,8 +382,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -405,8 +405,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); @@ -428,8 +428,8 @@ public class EclipseLinkJavaOneToOneMappingTests extends EclipseLinkContextModel createTestEntityWithDefaultOneToOne(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - Iterator<JavaModifiablePersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); - JavaModifiablePersistentAttribute persistentAttribute = attributes.next(); + Iterator<JavaSpecifiedPersistentAttribute> attributes = getJavaPersistentType().getAttributes().iterator(); + JavaSpecifiedPersistentAttribute persistentAttribute = attributes.next(); assertTrue(persistentAttribute.getMapping().isDefault()); assertEquals(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getDefaultMappingKey()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java index 66106a45ad..1347dce853 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaStructConverterTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapping; @@ -74,7 +74,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); @@ -85,7 +85,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); assertEquals("foo", converter.getName()); @@ -115,7 +115,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); @@ -147,7 +147,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); @@ -158,7 +158,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); assertEquals("Foo", converter.getConverterClass()); @@ -188,7 +188,7 @@ public class EclipseLinkJavaStructConverterTests extends EclipseLinkContextModel createTestEntityWithConvertAndStructConverterClass(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkStructConverter converter = basicMapping.getConverterContainer().getStructConverters().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java index 266400b5cf..b410561e58 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaTypeConverterTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapping; @@ -93,7 +93,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); @@ -104,7 +104,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); assertEquals("foo", converter.getName()); @@ -134,7 +134,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndTypeConverter(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); @@ -166,7 +166,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); @@ -177,7 +177,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); assertEquals("Foo", converter.getDataType()); @@ -207,7 +207,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndDataType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); @@ -239,7 +239,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); @@ -250,7 +250,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); assertEquals("Foo", converter.getObjectType()); @@ -280,7 +280,7 @@ public class EclipseLinkJavaTypeConverterTests extends EclipseLinkContextModelTe createTestEntityWithConvertAndObjectType(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); JavaEclipseLinkBasicMapping basicMapping = (JavaEclipseLinkBasicMapping) persistentAttribute.getMapping(); EclipseLinkTypeConverter converter = basicMapping.getConverterContainer().getTypeConverters().iterator().next(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java index f48c08d202..7b815ba6aa 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/java/EclipseLinkJavaVersionMappingTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.AstNodeType; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.VersionMapping; @@ -125,7 +125,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT resourceField.addAnnotation(EclipseLinkConvertAnnotation.ANNOTATION_NAME); getJpaProject().synchronizeContextModel(); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, versionMapping.getConverter().getType()); @@ -135,7 +135,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithConvert(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertEquals(EclipseLinkConvert.class, versionMapping.getConverter().getType()); @@ -146,7 +146,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); @@ -167,7 +167,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithVersionMapping(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); VersionMapping versionMapping = (VersionMapping) persistentAttribute.getMapping(); assertNull(versionMapping.getConverter().getType()); @@ -194,7 +194,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithMutableVersion(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = versionMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -228,7 +228,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithMutableVersion(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = versionMapping.getMutable(); assertEquals(Boolean.TRUE, mutable.getSpecifiedMutable()); @@ -257,7 +257,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithMutableVersion(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = versionMapping.getMutable(); assertTrue(mutable.isDefaultMutable()); @@ -279,7 +279,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithMutableVersionDate(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = versionMapping.getMutable(); assertFalse(mutable.isDefaultMutable()); @@ -307,7 +307,7 @@ public class EclipseLinkJavaVersionMappingTests extends EclipseLinkContextModelT createTestEntityWithMutableVersion(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - ModifiablePersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); + SpecifiedPersistentAttribute persistentAttribute = getJavaPersistentType().getAttributes().iterator().next(); EclipseLinkVersionMapping versionMapping = (EclipseLinkVersionMapping) persistentAttribute.getMapping(); EclipseLinkMutable mutable = versionMapping.getMutable(); assertTrue(mutable.isMutable()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java index e7d2ea573c..fe1b382cc2 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink1_1OrmPersistentAttributeTests.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -118,7 +118,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -127,7 +127,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -152,7 +152,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(2, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertTrue(specifiedOrmPersistentAttribute.getMapping() instanceof OrmEclipseLinkOneToOneMapping); @@ -163,7 +163,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -186,7 +186,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -221,7 +221,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.removeFromXml(); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); @@ -270,7 +270,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); //virtual orm attribute, access type matches java : FIELD, name matches java assertTrue(ormPersistentAttribute.isVirtual()); @@ -292,7 +292,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java //verify both the property java resource attribute and the field java resource attribute are used in orm //because the field is annotated and property is specified - ((OrmModifiablePersistentAttribute) ormPersistentAttribute).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) ormPersistentAttribute).removeFromXml(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); @@ -312,7 +312,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests ormPersistentType.setSpecifiedAccess(null);//default access will be field ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - OrmModifiablePersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); ormPersistentAttribute2.getMapping().setName("id2"); assertEquals(null, ormPersistentAttribute2.getJavaPersistentAttribute()); @@ -336,7 +336,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); OrmPersistentAttribute ormFieldAttribute = attributes.next(); OrmPersistentAttribute ormPropertyAttribute = attributes.next(); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertEquals(AccessType.FIELD, ormFieldAttribute.getAccess()); assertEquals(AccessType.PROPERTY, ormPropertyAttribute.getAccess()); @@ -357,7 +357,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests assertTrue(ormPropertyAttribute.getJavaPersistentAttribute().getResourceAttribute().getAstNodeType() == AstNodeType.METHOD); assertTrue(javaPersistentAttribute.getResourceAttribute().getAstNodeType() == AstNodeType.FIELD); - ((OrmModifiablePersistentAttribute) ormPropertyAttribute).setSpecifiedAccess(AccessType.FIELD); + ((OrmSpecifiedPersistentAttribute) ormPropertyAttribute).setSpecifiedAccess(AccessType.FIELD); ormPropertyAttribute = ormPersistentType.getAttributeNamed("id"); assertFalse(ormPropertyAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPropertyAttribute.getAccess()); @@ -372,7 +372,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.FIELD, ormPersistentAttribute.getAccess()); @@ -405,7 +405,7 @@ public class EclipseLink1_1OrmPersistentAttributeTests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); assertTrue(ormPersistentAttribute.isVirtual()); assertEquals(AccessType.PROPERTY, ormPersistentAttribute.getAccess()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmCollectionTableTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmCollectionTableTests.java index 805275705d..3532a0df12 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmCollectionTableTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmCollectionTableTests.java @@ -18,10 +18,10 @@ import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmUniqueConstraint; @@ -170,7 +170,7 @@ public class EclipseLink2_0OrmCollectionTableTests assertEquals(TYPE_NAME + "_id", virtualJoinColumn.getDefaultName()); assertEquals("id", virtualJoinColumn.getDefaultReferencedColumnName()); - JavaModifiablePersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = ormPersistentAttribute.getJavaPersistentAttribute(); JavaElementCollectionMapping2_0 javaElementCollectionMapping = (JavaElementCollectionMapping2_0) javaPersistentAttribute.getMapping(); JavaCollectionTable2_0 javaCollectionTable = javaElementCollectionMapping.getCollectionTable(); javaCollectionTable.setSpecifiedName("FOO"); @@ -193,7 +193,7 @@ public class EclipseLink2_0OrmCollectionTableTests createTestEntityWithValidElementCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("projects"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmCollectionTable2_0 ormCollectionTable = ormElementCollectionMapping.getCollectionTable(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java index f5851bbbf9..12fd5d5b3a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmElementCollectionMappingTests.java @@ -40,7 +40,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; @@ -303,7 +303,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -325,7 +325,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -349,7 +349,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.getMapping().setName("foo"); assertEquals(3, ormPersistentType.getDefaultAttributesSize()); @@ -417,7 +417,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormElementCollectionMapping.getName()); @@ -430,7 +430,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -448,7 +448,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -466,7 +466,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -484,7 +484,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -502,7 +502,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -520,7 +520,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -539,7 +539,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -558,7 +558,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); @@ -577,7 +577,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertFalse(elementCollectionMapping.isDefault()); elementCollectionMapping.setSpecifiedFetch(FetchType.EAGER); @@ -595,7 +595,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -621,7 +621,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -647,7 +647,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -669,7 +669,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -694,7 +694,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.EMBEDDABLE_TYPE, elementCollectionMapping.getValueType()); @@ -706,7 +706,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -718,7 +718,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.NO_TYPE, elementCollectionMapping.getValueType()); @@ -733,7 +733,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, "test.Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); ElementCollectionMapping2_0 elementCollectionMapping = (ElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); assertEquals(ElementCollectionMapping2_0.Type.BASIC_TYPE, elementCollectionMapping.getValueType()); @@ -744,7 +744,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -811,7 +811,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection xmlElementColection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -897,7 +897,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -951,7 +951,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection elementCollection = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -971,7 +971,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests public void testOrderColumnDefaults() throws Exception { createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable(); @@ -994,7 +994,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests public void testVirtualOrderColumn() throws Exception { createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 elementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = (Orderable2_0) elementCollectionMapping.getOrderable(); @@ -1077,7 +1077,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestEntityWithGenericBasicElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); OrmSpecifiedColumn ormColumn = addressesVirtualMapping.getValueColumn(); @@ -1152,7 +1152,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1193,7 +1193,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); OrmAttributeOverrideContainer attributeOverrideContainer = ormElementCollectionMapping.getValueAttributeOverrideContainer(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1247,7 +1247,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses")); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses")); ormPersistentAttribute.getMapping().setName("foo"); assertEquals(3, ormPersistentType.getDefaultAttributesSize()); @@ -1431,7 +1431,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestEntityWithValidMapElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 addressesVirtualMapping = (OrmElementCollectionMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -1514,7 +1514,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1540,7 +1540,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1567,7 +1567,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1597,7 +1597,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlElementCollection_2_0 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); @@ -1624,7 +1624,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestEntityWithElementCollectionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlConvertibleMapping_2_1 elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); XmlConvert xmlConvert = (XmlConvert) elementCollectionResource.getConvert(); @@ -1679,7 +1679,7 @@ public class EclipseLink2_0OrmElementCollectionMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("elementCollection"), MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY); OrmElementCollectionMapping2_0 ormElementCollectionMapping = (OrmElementCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlConvertibleMapping elementCollectionResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getElementCollections().get(0); XmlConvert xmlConvert = (XmlConvert) elementCollectionResource.getConvert(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java index e23fdc1b5d..ac3d012745 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToManyMappingTests.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -353,7 +353,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -420,7 +420,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping ormManyToManyMapping = (OrmManyToManyMapping) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -509,7 +509,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -563,7 +563,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany manyToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -586,13 +586,13 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestEntityPrintJob(); OrmPersistentType printQueuePersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); - OrmModifiablePersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping jobsMapping = (OrmManyToManyMapping) jobsPersistentAttribute.getMapping(); jobsMapping.getRelationship().setStrategyToMappedBy(); jobsMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("queues"); OrmPersistentType printJobPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping queuesMapping = (OrmManyToManyMapping) queuesPersistentAttribute.getMapping(); getOrmXmlResource().save(null); @@ -647,11 +647,11 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestEntityPrintJob(); OrmPersistentType printQueuePersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); - OrmModifiablePersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute jobsPersistentAttribute = printQueuePersistentType.addAttributeToXml(printQueuePersistentType.getAttributeNamed("jobs"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping jobsMapping = (OrmManyToManyMapping) jobsPersistentAttribute.getMapping(); OrmPersistentType printJobPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute queuesPersistentAttribute = printJobPersistentType.addAttributeToXml(printJobPersistentType.getAttributeNamed("queues"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmManyToManyMapping queuesMapping = (OrmManyToManyMapping) queuesPersistentAttribute.getMapping(); Orderable2_0 jobsOrderable = ((Orderable2_0) jobsMapping.getOrderable()); @@ -849,7 +849,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 addressesVirtualMapping = (OrmCollectionMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -966,7 +966,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - OrmModifiablePersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute= ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEclipseLinkManyToManyMapping ormManyToManyMapping = (OrmEclipseLinkManyToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToManyMapping.getName()); @@ -992,7 +992,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1018,7 +1018,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1045,7 +1045,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); @@ -1075,7 +1075,7 @@ public class EclipseLink2_0OrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToManyMapping"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmCollectionMapping2_0 ormManyToManyMapping = (OrmCollectionMapping2_0) ormPersistentAttribute.getMapping(); XmlManyToMany_2_0 manyToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getManyToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java index 046f82b135..4ea67c5adc 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmManyToOneMappingTests.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -301,7 +301,7 @@ public class EclipseLink2_0OrmManyToOneMappingTests public void testMorphMapping() throws Exception { createTestEntityWithIdDerivedIdentity(); OrmPersistentType contextType = getEntityMappings().getPersistentType(FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute contextAttribute = (OrmModifiablePersistentAttribute) contextType.getAttributeNamed("manyToOne"); + OrmSpecifiedPersistentAttribute contextAttribute = (OrmSpecifiedPersistentAttribute) contextType.getAttributeNamed("manyToOne"); XmlEntity resourceEntity = (XmlEntity) contextType.getMapping().getXmlTypeMapping(); XmlManyToOne resourceManyToOne = resourceEntity.getAttributes().getManyToOnes().get(0); @@ -392,7 +392,7 @@ public class EclipseLink2_0OrmManyToOneMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); ManyToOneMapping2_0 ormManyToOneMapping = (ManyToOneMapping2_0) ormPersistentAttribute.getMapping(); ((ManyToOneRelationship2_0) ormManyToOneMapping.getRelationship()).setStrategyToJoinTable(); JoinTable ormJoinTable = ((OrmManyToOneRelationship2_0) ormManyToOneMapping.getRelationship()).getJoinTableStrategy().getJoinTable(); @@ -566,7 +566,7 @@ public class EclipseLink2_0OrmManyToOneMappingTests assertTrue(virtualPersistentAttribute.isVirtual()); virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); ManyToOneMapping2_0 ormManyToOneMapping = (ManyToOneMapping2_0) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java index 932fed3c27..8089e31958 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToManyMappingTests.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -263,7 +263,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -285,7 +285,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 oneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(oneToManyMapping); XmlOneToMany oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -417,7 +417,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -479,7 +479,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany oneToMany = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -503,7 +503,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping oneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); oneToManyMapping.getRelationship().setStrategyToMappedBy(); oneToManyMapping.getRelationship().getMappedByStrategy().setMappedByAttribute("queue"); @@ -536,7 +536,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintQueue"); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".PrintJob"); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("jobs"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmOneToManyMapping oneToManyMapping = (OrmOneToManyMapping) ormPersistentAttribute.getMapping(); Orderable2_0 orderable = ((Orderable2_0) oneToManyMapping.getOrderable()); @@ -708,7 +708,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".Address"); - OrmModifiablePersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute addressesPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("addresses"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 addressesVirtualMapping = (OneToManyMapping2_0) addressesPersistentAttribute.getMapping(); SpecifiedColumn ormColumn = addressesVirtualMapping.getMapKeyColumn(); @@ -1104,7 +1104,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1130,7 +1130,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1157,7 +1157,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); @@ -1187,7 +1187,7 @@ public class EclipseLink2_0OrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); OneToManyMapping2_0 ormOneToManyMapping = (OneToManyMapping2_0) ormPersistentAttribute.getMapping(); XmlOneToMany_2_0 oneToManyResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToManys().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java index 5116d73c30..687d45109c 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_0OrmOneToOneMappingTests.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -378,7 +378,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests public void testMorphMapping() throws Exception { createTestEntityWithMapsIdDerivedIdentity(); OrmPersistentType contextType = getEntityMappings().getPersistentType(FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute contextAttribute = (OrmModifiablePersistentAttribute) contextType.getAttributeNamed("oneToOne"); + OrmSpecifiedPersistentAttribute contextAttribute = (OrmSpecifiedPersistentAttribute) contextType.getAttributeNamed("oneToOne"); XmlEntity resourceEntity = (XmlEntity) contextType.getMapping().getXmlTypeMapping(); XmlOneToOne resourceOneToOne = resourceEntity.getAttributes().getOneToOnes().get(0); @@ -509,7 +509,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToOneMapping); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -531,7 +531,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); OrphanRemovable2_0 mappingsOrphanRemoval = this.getOrphanRemovalOf(ormOneToOneMapping); XmlOneToOne oneToOneResource = getXmlEntityMappings().getEntities().get(0).getAttributes().getOneToOnes().get(0); @@ -609,7 +609,7 @@ public class EclipseLink2_0OrmOneToOneMappingTests OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); OneToOneMapping2_0 ormOneToOneMapping = (OneToOneMapping2_0) ormPersistentAttribute.getMapping(); ((OneToOneRelationship2_0) ormOneToOneMapping.getRelationship()).setStrategyToJoinTable(); OrmJoinTable ormJoinTable = ((OrmOneToOneRelationship2_0) ormOneToOneMapping.getRelationship()).getJoinTableStrategy().getJoinTable(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_1OrmPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_1OrmPersistentTypeTests.java index 93a4ed48ab..a7afb319fa 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_1OrmPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLink2_1OrmPersistentTypeTests.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlManyToMany; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; @@ -248,7 +248,7 @@ public class EclipseLink2_1OrmPersistentTypeTests XmlEntity xmlEntity = (XmlEntity) xmlEntityMappings.getEntities().get(0); // test virtual attribute mapping that only needs to set attribute type - OrmModifiablePersistentAttribute persistentAttribute = persistentType.addVirtualAttribute("id", MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "int", null); + OrmSpecifiedPersistentAttribute persistentAttribute = persistentType.addVirtualAttribute("id", MappingKeys.ID_ATTRIBUTE_MAPPING_KEY, "int", null); assertEquals("id", persistentAttribute.getName()); assertEquals(EclipseLinkAccessType.VIRTUAL, persistentAttribute.getSpecifiedAccess()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java index 5cd5e1085c..22de0c5318 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmBasicMappingTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -83,7 +83,7 @@ public class EclipseLinkOrmBasicMappingTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping contextBasic = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -165,7 +165,7 @@ public class EclipseLinkOrmBasicMappingTests createTestEntityWithMutableBasicDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping contextBasic = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -263,7 +263,7 @@ public class EclipseLinkOrmBasicMappingTests createTestEntityWithMutableBasicDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping contextBasic = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -310,7 +310,7 @@ public class EclipseLinkOrmBasicMappingTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); XmlConvert xmlConvert = (XmlConvert) basicResource.getConvert(); @@ -365,7 +365,7 @@ public class EclipseLinkOrmBasicMappingTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmBasicMapping ormBasicMapping = (OrmBasicMapping) ormPersistentAttribute.getMapping(); XmlBasic basicResource = (XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0); XmlConvert xmlConvert = (XmlConvert) basicResource.getConvert(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java index c14a1e53e8..5be58643c1 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmConverterTests.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.OrmEclipseLinkBasicMapping; @@ -58,7 +58,7 @@ public class EclipseLinkOrmConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); OrmEclipseLinkCustomConverter ormConverter = ormBasicMapping.getConverterContainer().addCustomConverter("customConverter", 0); XmlConverter converterResource = (XmlConverter) ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverters().get(0); @@ -81,7 +81,7 @@ public class EclipseLinkOrmConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); OrmEclipseLinkCustomConverter ormConverter = ormBasicMapping.getConverterContainer().addCustomConverter("customConverter", 0); XmlConverter converterResource = (XmlConverter) ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverters().get(0); @@ -104,7 +104,7 @@ public class EclipseLinkOrmConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); OrmEclipseLinkCustomConverter ormConverter = ormBasicMapping.getConverterContainer().addCustomConverter("customConverter", 0); XmlConverter converterResource = (XmlConverter) ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverters().get(0); @@ -127,7 +127,7 @@ public class EclipseLinkOrmConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); OrmEclipseLinkCustomConverter ormConverter = ormBasicMapping.getConverterContainer().addCustomConverter("customConverter", 0); XmlConverter converterResource = (XmlConverter) ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getConverters().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java index 91da366961..250d5319b5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmIdMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -83,7 +83,7 @@ public class EclipseLinkOrmIdMappingTests createTestEntityWithIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkIdMapping contextId = (OrmEclipseLinkIdMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -165,7 +165,7 @@ public class EclipseLinkOrmIdMappingTests createTestEntityWithMutableIdDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkIdMapping contextId = (OrmEclipseLinkIdMapping) ormPersistentAttribute.getMapping(); @@ -264,7 +264,7 @@ public class EclipseLinkOrmIdMappingTests createTestEntityWithMutableIdDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkIdMapping contextId = (OrmEclipseLinkIdMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -311,7 +311,7 @@ public class EclipseLinkOrmIdMappingTests createTestEntityWithIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); XmlConvert xmlConvert = (XmlConvert) idResource.getConvert(); @@ -366,7 +366,7 @@ public class EclipseLinkOrmIdMappingTests createTestEntityWithIdMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); OrmIdMapping ormIdMapping = (OrmIdMapping) ormPersistentAttribute.getMapping(); XmlId idResource = (XmlId) getXmlEntityMappings().getEntities().get(0).getAttributes().getIds().get(0); XmlConvert xmlConvert = (XmlConvert) idResource.getConvert(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java index f55540410c..aa8b59aa17 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToManyMappingTests.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.JoinTable; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -174,7 +174,7 @@ public class EclipseLinkOrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToMany"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToMany"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkRelationshipMapping contextManyToMany = (EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -213,7 +213,7 @@ public class EclipseLinkOrmManyToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToMany"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToMany"), MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkRelationshipMapping contextManyToMany = (EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -374,7 +374,7 @@ public class EclipseLinkOrmManyToManyMappingTests assertEquals(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY, virtualPersistentAttribute.getMappingKey()); assertTrue(virtualPersistentAttribute.isVirtual()); - OrmModifiablePersistentAttribute ormPersistentAttribute = virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = virtualPersistentAttribute.addToXml(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkManyToManyMapping ormManyToManyMapping = (OrmEclipseLinkManyToManyMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormManyToManyMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java index dbaf14bce9..05874d0860 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmManyToOneMappingTests.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -163,7 +163,7 @@ public class EclipseLinkOrmManyToOneMappingTests createTestTypeWithManyToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToOne"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToOne"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkRelationshipMapping contextManyToOne = (EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -202,7 +202,7 @@ public class EclipseLinkOrmManyToOneMappingTests createTestTypeWithManyToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToOne"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("manyToOne"), MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkRelationshipMapping contextManyToOne = (EclipseLinkRelationshipMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java index 3985ce781d..1529617a6a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmObjectTypeConverterTests.java @@ -14,7 +14,7 @@ import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue; @@ -62,7 +62,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -85,7 +85,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -107,7 +107,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -130,7 +130,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -152,7 +152,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -175,7 +175,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -197,7 +197,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -220,7 +220,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -243,7 +243,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); @@ -325,7 +325,7 @@ public class EclipseLinkOrmObjectTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkObjectTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addObjectTypeConverter("objectTypeConverter", 0); XmlObjectTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getObjectTypeConverters().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java index c786bf5b78..ef1f9e9a46 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToManyMappingTests.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.JoinTable; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -260,7 +260,7 @@ public class EclipseLinkOrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToManyMapping contextOneToMany = (EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -292,7 +292,7 @@ public class EclipseLinkOrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToManyMapping contextOneToMany = (EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -324,7 +324,7 @@ public class EclipseLinkOrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToManyMapping contextOneToMany = (EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -363,7 +363,7 @@ public class EclipseLinkOrmOneToManyMappingTests createTestTypeWithCollection(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToMany"), MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToManyMapping contextOneToMany = (EclipseLinkOneToManyMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java index b961cddab7..3817539f39 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmOneToOneMappingTests.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.SpecifiedJoinColumn; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -165,7 +165,7 @@ public class EclipseLinkOrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToOneMapping contextOneToOne = (EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -197,7 +197,7 @@ public class EclipseLinkOrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToOneMapping contextOneToOne = (EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -226,7 +226,7 @@ public class EclipseLinkOrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToOneMapping contextOneToOne = (EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -265,7 +265,7 @@ public class EclipseLinkOrmOneToOneMappingTests createTestTypeWithOneToOneAttribute(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("oneToOne"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); EclipseLinkOneToOneMapping contextOneToOne = (EclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping(); XmlEntity resourceEntity = @@ -416,7 +416,7 @@ public class EclipseLinkOrmOneToOneMappingTests ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("address"), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); assertEquals(2, ormPersistentType.getDefaultAttributesSize()); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); OrmEclipseLinkOneToOneMapping ormOneToOneMapping = (OrmEclipseLinkOneToOneMapping) ormPersistentAttribute.getMapping(); assertEquals("address", ormOneToOneMapping.getName()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java index 80f760b727..9e3a0183d7 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmPersistentAttributeTests.java @@ -19,9 +19,9 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaNullAttributeMapping; @@ -111,7 +111,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -120,7 +120,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -145,7 +145,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(2, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("address", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); assertEquals(specifiedOrmPersistentAttribute.getMappingKey(), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -156,7 +156,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - Iterator<OrmModifiablePersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); + Iterator<OrmSpecifiedPersistentAttribute> specifiedAttributes = ormPersistentType.getSpecifiedAttributes().iterator(); specifiedOrmPersistentAttribute = specifiedAttributes.next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); @@ -179,7 +179,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(0, ormPersistentType.getDefaultAttributesSize()); assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); assertEquals("id", specifiedOrmPersistentAttribute.getName()); assertFalse(specifiedOrmPersistentAttribute.isVirtual()); @@ -214,7 +214,7 @@ public class EclipseLinkOrmPersistentAttributeTests assertEquals(2, ormPersistentType.getSpecifiedAttributesSize()); - OrmModifiablePersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); + OrmSpecifiedPersistentAttribute specifiedOrmPersistentAttribute = ormPersistentType.getSpecifiedAttributes().iterator().next(); specifiedOrmPersistentAttribute.removeFromXml(); assertEquals(1, ormPersistentType.getDefaultAttributesSize()); assertEquals(1, ormPersistentType.getSpecifiedAttributesSize()); @@ -263,7 +263,7 @@ public class EclipseLinkOrmPersistentAttributeTests JavaPersistentType javaPersistentType = ormPersistentType.getJavaPersistentType(); OrmPersistentAttribute ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - JavaModifiablePersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute javaPersistentAttribute = javaPersistentType.getAttributeNamed("id"); //virtual orm attribute, access type matches java : FIELD, name matches java assertTrue(ormPersistentAttribute.isVirtual()); @@ -285,7 +285,7 @@ public class EclipseLinkOrmPersistentAttributeTests //virtual orm attribute, java access type FIELD, orm access type PROPERTY, name matches java //verify both the property java resource attribute and the field java resource attribute are used in orm //because the field is annotated and property is specified - ((OrmModifiablePersistentAttribute) ormPersistentAttribute).removeFromXml(); + ((OrmSpecifiedPersistentAttribute) ormPersistentAttribute).removeFromXml(); ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); ormPersistentType.setSpecifiedAccess(AccessType.PROPERTY); ListIterator<OrmPersistentAttribute> attributes = ormPersistentType.getAttributes().iterator(); @@ -305,7 +305,7 @@ public class EclipseLinkOrmPersistentAttributeTests ormPersistentType.setSpecifiedAccess(null);//default access will be field ormPersistentAttribute = ormPersistentType.getAttributeNamed("id"); - OrmModifiablePersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); + OrmSpecifiedPersistentAttribute ormPersistentAttribute2 = ormPersistentAttribute.addToXml(); ormPersistentAttribute2.getMapping().setName("id2"); assertEquals(null, ormPersistentAttribute2.getJavaPersistentAttribute()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java index c3b54ca76a..edd7f84669 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmStructConverterTests.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructConverter; @@ -58,7 +58,7 @@ public class EclipseLinkOrmStructConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkStructConverter ormConverter = ormBasicMapping.getConverterContainer().addStructConverter("structConverter", 0); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverters().get(0); @@ -81,7 +81,7 @@ public class EclipseLinkOrmStructConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkStructConverter ormConverter = ormBasicMapping.getConverterContainer().addStructConverter("structConverter", 0); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverters().get(0); @@ -103,7 +103,7 @@ public class EclipseLinkOrmStructConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkStructConverter ormConverter = ormBasicMapping.getConverterContainer().addStructConverter("structConverter", 0); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverters().get(0); @@ -126,7 +126,7 @@ public class EclipseLinkOrmStructConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkStructConverter ormConverter = ormBasicMapping.getConverterContainer().addStructConverter("structConverter", 0); XmlStructConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getStructConverters().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTransientMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTransientMappingTests.java index bd43ad3b93..ccc45b860a 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTransientMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTransientMappingTests.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.JPA; @@ -54,7 +54,7 @@ public class EclipseLinkOrmTransientMappingTests assertTrue(persistentAttribute.isVirtual()); assertEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, persistentAttribute.getMappingKey()); - OrmModifiablePersistentAttribute persistentAttribute2 = persistentAttribute.addToXml(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute persistentAttribute2 = persistentAttribute.addToXml(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); assertFalse(persistentAttribute2.isVirtual()); assertEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, persistentAttribute2.getMappingKey()); assertEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY, persistentAttribute2.getMapping().getKey()); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java index ac675cbf56..8062f23187 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmTypeConverterTests.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTypeConverter; @@ -58,7 +58,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); @@ -81,7 +81,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); @@ -103,7 +103,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); @@ -126,7 +126,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); @@ -148,7 +148,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); @@ -171,7 +171,7 @@ public class EclipseLinkOrmTypeConverterTests createTestEntityWithBasicMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkBasicMapping ormBasicMapping = (OrmEclipseLinkBasicMapping) ormPersistentAttribute.getMapping(); EclipseLinkTypeConverter ormConverter = ormBasicMapping.getConverterContainer().addTypeConverter("typeConverter", 0); XmlTypeConverter converterResource = ((XmlBasic) getXmlEntityMappings().getEntities().get(0).getAttributes().getBasics().get(0)).getTypeConverters().get(0); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java index c04b3fb9c5..d4843a66e2 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/orm/EclipseLinkOrmVersionMappingTests.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.orm.OrmSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; @@ -83,7 +83,7 @@ public class EclipseLinkOrmVersionMappingTests createTestEntityWithVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkVersionMapping contextVersion = (OrmEclipseLinkVersionMapping) ormPersistentAttribute.getMapping(); @@ -165,7 +165,7 @@ public class EclipseLinkOrmVersionMappingTests createTestEntityWithMutableVersionDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkVersionMapping contextVersion = (OrmEclipseLinkVersionMapping) ormPersistentAttribute.getMapping(); @@ -263,7 +263,7 @@ public class EclipseLinkOrmVersionMappingTests createTestEntityWithMutableVersionDate(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("myDate"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmEclipseLinkVersionMapping contextVersion = (OrmEclipseLinkVersionMapping) ormPersistentAttribute.getMapping(); @@ -311,7 +311,7 @@ public class EclipseLinkOrmVersionMappingTests createTestEntityWithVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); XmlConvert xmlConvert = (XmlConvert) versionResource.getConvert(); @@ -366,7 +366,7 @@ public class EclipseLinkOrmVersionMappingTests createTestEntityWithVersionMapping(); OrmPersistentType ormPersistentType = getEntityMappings().addPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); - OrmModifiablePersistentAttribute ormPersistentAttribute = + OrmSpecifiedPersistentAttribute ormPersistentAttribute = ormPersistentType.addAttributeToXml(ormPersistentType.getAttributeNamed("id"), MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); OrmVersionMapping ormVersionMapping = (OrmVersionMapping) ormPersistentAttribute.getMapping(); XmlVersion versionResource = (XmlVersion) getXmlEntityMappings().getEntities().get(0).getAttributes().getVersions().get(0); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java index 89fb16d431..0d9b1c8bb9 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/JPADiagramEditor.java @@ -56,7 +56,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.ui.JpaFileModel; @@ -385,8 +385,8 @@ public class JPADiagramEditor extends DiagramEditor implements JpaEditorManager{ if (node != null) { if (node.getType().isAssignableFrom(JavaPersistentType.class)) { resource = ((JavaPersistentType) node).getResource(); - } else if (node.getType().isAssignableFrom(JavaModifiablePersistentAttribute.class)) { - resource = ((JavaModifiablePersistentAttribute) node).getResource(); + } else if (node.getType().isAssignableFrom(JavaSpecifiedPersistentAttribute.class)) { + resource = ((JavaSpecifiedPersistentAttribute) node).getResource(); } if (resource != null && resource.exists() && (resource instanceof IFile)) { diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java index 4dbb7608fe..1aea5768ec 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/AddAttributeCommand.java @@ -27,7 +27,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.common.utility.command.Command;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage;
@@ -113,7 +113,7 @@ public class AddAttributeCommand implements Command { actName, cu, type, isCollection, attrTypes, contents);
if(jpt != null) {
- JavaModifiablePersistentAttribute attr = jpt.getAttributeNamed(actName);
+ JavaSpecifiedPersistentAttribute attr = jpt.getAttributeNamed(actName);
int cnt = 0;
while ((attr == null) && (cnt < 25)) {
try {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/SetMappedByNewValueCommand.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/SetMappedByNewValueCommand.java index bc34d28166..cc768c5909 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/SetMappedByNewValueCommand.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/command/SetMappedByNewValueCommand.java @@ -18,7 +18,7 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.command; import org.eclipse.jpt.common.core.resource.java.Annotation;
import org.eclipse.jpt.common.utility.command.Command;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider;
@@ -31,14 +31,14 @@ public class SetMappedByNewValueCommand implements Command { private PersistenceUnit pu;
private String inverseEntityName;
private String inverseAttributeName;
- private JavaModifiablePersistentAttribute newAt;
- private JavaModifiablePersistentAttribute oldAt;
+ private JavaSpecifiedPersistentAttribute newAt;
+ private JavaSpecifiedPersistentAttribute oldAt;
private IRelation rel;
public SetMappedByNewValueCommand(IJPAEditorFeatureProvider fp,
PersistenceUnit pu, String inverseEntityName,
- String inverseAttributeName, JavaModifiablePersistentAttribute newAt,
- JavaModifiablePersistentAttribute oldAt,
+ String inverseAttributeName, JavaSpecifiedPersistentAttribute newAt,
+ JavaSpecifiedPersistentAttribute oldAt,
IRelation rel) {
super();
this.fp =fp;
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java index 9847bbdf89..e9712c625a 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddAttributeFeature.java @@ -31,7 +31,7 @@ import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm; import org.eclipse.graphiti.mm.algorithms.Text; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.Wrp; @@ -54,10 +54,10 @@ public class AddAttributeFeature extends AbstractAddShapeFeature { public PictogramElement add(final IAddContext context) { Object o = context.getNewObject(); - if (!(o instanceof JavaModifiablePersistentAttribute)) { + if (!(o instanceof JavaSpecifiedPersistentAttribute)) { return null; } - final JavaModifiablePersistentAttribute newAttr = (JavaModifiablePersistentAttribute) o; + final JavaSpecifiedPersistentAttribute newAttr = (JavaSpecifiedPersistentAttribute) o; getFeatureProvider().putKeyToBusinessObject(getFeatureProvider().getKeyForBusinessObject(newAttr), newAttr); PictogramElement pe = getFeatureProvider().getPictogramElementForBusinessObject(newAttr); @@ -78,14 +78,14 @@ public class AddAttributeFeature extends AbstractAddShapeFeature { return (PictogramElement)wrp.getObj(); } - private void expand(JavaModifiablePersistentAttribute jpa) { + private void expand(JavaSpecifiedPersistentAttribute jpa) { ContainerShape attributeShape = (ContainerShape) getFeatureProvider().getPictogramElementForBusinessObject(jpa); ICustomContext customContext = new CustomContext(new PictogramElement[] { attributeShape.getContainer() }); expandCompartmentFeature.execute(customContext); } - private ContainerShape graphicalAdd(ContainerShape entityShape, JavaModifiablePersistentAttribute newAttr) { + private ContainerShape graphicalAdd(ContainerShape entityShape, JavaSpecifiedPersistentAttribute newAttr) { AddContext context = new AddContext(); context.setNewObject(newAttr); context.setTargetContainer(entityShape); @@ -112,7 +112,7 @@ public class AddAttributeFeature extends AbstractAddShapeFeature { public boolean canAdd(IAddContext context) { Object o = context.getNewObject(); - return o instanceof JavaModifiablePersistentAttribute; + return o instanceof JavaSpecifiedPersistentAttribute; } }
\ No newline at end of file diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java index 0238c6f23c..8bcec94fc8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddJPAEntityFeature.java @@ -46,7 +46,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.SourceType; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; @@ -285,9 +285,9 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { private void addCompartmentChildren( ContainerShape containerShape, JavaPersistentType jpt, String attributeAnnotations, String[] excludeAnnotations) { - List<JavaModifiablePersistentAttribute> attributes = new ArrayList<JavaModifiablePersistentAttribute>(); + List<JavaSpecifiedPersistentAttribute> attributes = new ArrayList<JavaSpecifiedPersistentAttribute>(); - for (JavaModifiablePersistentAttribute attribute : jpt.getAttributes()) { + for (JavaSpecifiedPersistentAttribute attribute : jpt.getAttributes()) { HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(attribute); if (annotations.contains(attributeAnnotations) && canAddAttribute(annotations, excludeAnnotations)) { attributes.add(attribute); @@ -308,9 +308,9 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { } private void addBasicAttributes(ContainerShape containerShape, JavaPersistentType jpt){ - List<JavaModifiablePersistentAttribute> attributes = new ArrayList<JavaModifiablePersistentAttribute>(); + List<JavaSpecifiedPersistentAttribute> attributes = new ArrayList<JavaSpecifiedPersistentAttribute>(); - for (JavaModifiablePersistentAttribute attribute : jpt.getAttributes()){ + for (JavaSpecifiedPersistentAttribute attribute : jpt.getAttributes()){ HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(attribute); if(!(annotations.contains(JPAEditorConstants.ANNOTATION_ID))&& !(annotations.contains(JPAEditorConstants.ANNOTATION_EMBEDDED_ID)) && !(annotations.contains(JPAEditorConstants.ANNOTATION_MANY_TO_MANY)) && !(annotations.contains(JPAEditorConstants.ANNOTATION_MANY_TO_ONE)) && !(annotations.contains(JPAEditorConstants.ANNOTATION_ONE_TO_MANY))&& @@ -322,9 +322,9 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { } private void addAttributes(ContainerShape entityShape, - List<JavaModifiablePersistentAttribute> attributes) { + List<JavaSpecifiedPersistentAttribute> attributes) { for (int i = 0; i < attributes.size(); i++) { - JavaModifiablePersistentAttribute jpa = attributes.get(i); + JavaSpecifiedPersistentAttribute jpa = attributes.get(i); addAttribute(jpa, entityShape); } } @@ -433,7 +433,7 @@ public class AddJPAEntityFeature extends AbstractAddShapeFeature { } - private void addAttribute(JavaModifiablePersistentAttribute pa, + private void addAttribute(JavaSpecifiedPersistentAttribute pa, ContainerShape compartmentShape) { IJPAEditorFeatureProvider fp = getFeatureProvider(); fp.putKeyToBusinessObject(fp.getKeyForBusinessObject(pa), pa); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java index 106715a355..68906ac2d3 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/AddRelationFeature.java @@ -39,7 +39,7 @@ import org.eclipse.graphiti.mm.pictograms.FreeFormConnection; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.services.Graphiti; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -201,7 +201,7 @@ public class AddRelationFeature extends AbstractAddFeature { if (RelDir.UNI.equals(direction)) { isOptional = true; } else { - JavaModifiablePersistentAttribute inverse = rel.getInverse().getAttributeNamed(rel.getInverseAttributeName()); + JavaSpecifiedPersistentAttribute inverse = rel.getInverse().getAttributeNamed(rel.getInverseAttributeName()); JavaAttributeMapping mapping = inverse.getMapping(); a = (OneToOneAnnotation)mapping.getMappingAnnotation(); if (a != null) { @@ -210,7 +210,7 @@ public class AddRelationFeature extends AbstractAddFeature { imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, isOptional ? JPAEditorConstants.CARDINALITY_ZERO_ONE : JPAEditorConstants.CARDINALITY_ONE, 0.0); } } - JavaModifiablePersistentAttribute owner = rel.getOwner().getAttributeNamed(rel.getOwnerAttributeName()); + JavaSpecifiedPersistentAttribute owner = rel.getOwner().getAttributeNamed(rel.getOwnerAttributeName()); owner.update(); HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(owner); if(isDerivedId(annotations)){ @@ -247,7 +247,7 @@ public class AddRelationFeature extends AbstractAddFeature { boolean isOptional = false; imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, JPAEditorConstants.CARDINALITY_ZERO_N, 0.0); imageCreator.createCardinalityConnectionDecorator(getDiagram(), c, rel.getOwnerAttributeName(), 0.0); - JavaModifiablePersistentAttribute owner = rel.getOwner().getAttributeNamed(rel.getOwnerAttributeName()); + JavaSpecifiedPersistentAttribute owner = rel.getOwner().getAttributeNamed(rel.getOwnerAttributeName()); HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(owner); if(isDerivedId(annotations)){ diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java index ec1a26739f..6e0dcd5bfe 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddAttributeButtonFeature.java @@ -21,7 +21,7 @@ import org.eclipse.graphiti.features.context.ICreateContext; import org.eclipse.graphiti.features.impl.AbstractCreateFeature; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -55,7 +55,7 @@ public class ClickAddAttributeButtonFeature extends AbstractCreateFeature { JavaPersistentType jpt = (JavaPersistentType)getFeatureProvider().getBusinessObjectForPictogramElement(entityShape); String newAttrName = JpaArtifactFactory.instance().createNewAttribute(jpt, false, getFeatureProvider()); - JavaModifiablePersistentAttribute newAttr = (JavaModifiablePersistentAttribute) jpt.resolveAttribute(newAttrName); + JavaSpecifiedPersistentAttribute newAttr = (JavaSpecifiedPersistentAttribute) jpt.resolveAttribute(newAttrName); getFeatureProvider().addAddIgnore((JavaPersistentType)newAttr.getParent(), newAttr.getName()); addGraphicalRepresentation(context, newAttr); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java index 0bc9b6e8fe..3961e3f492 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickAddElementCollectionButtonFeature.java @@ -22,7 +22,7 @@ import org.eclipse.graphiti.features.context.ICreateContext; import org.eclipse.graphiti.features.impl.AbstractCreateFeature;
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0;
import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollection2_0Annotation;
@@ -57,7 +57,7 @@ public class ClickAddElementCollectionButtonFeature extends AbstractCreateFeatur JavaPersistentType jpt = (JavaPersistentType)getFeatureProvider().getBusinessObjectForPictogramElement(entityShape);
String newAttrName = JpaArtifactFactory.instance().createNewAttribute(jpt, true, getFeatureProvider());
- JavaModifiablePersistentAttribute newAttr = (JavaModifiablePersistentAttribute) jpt.resolveAttribute(newAttrName);
+ JavaSpecifiedPersistentAttribute newAttr = (JavaSpecifiedPersistentAttribute) jpt.resolveAttribute(newAttrName);
newAttr.setMappingKey(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY);
newAttr.getResourceAttribute().addAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java index 39e52da20b..a1c703c51c 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/ClickRemoveAttributeButtonFeature.java @@ -34,7 +34,7 @@ import org.eclipse.jpt.common.ui.internal.utility.SynchronousUiCommandExecutor; import org.eclipse.jpt.common.utility.command.Command; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; @@ -185,7 +185,7 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { */ private boolean hasSameEmbeddedId(JavaPersistentType jpt, String fqn){ JpaArtifactFactory jpaFactory = JpaArtifactFactory.instance(); - for(JavaModifiablePersistentAttribute jpa : ((JavaPersistentType)jpt).getAttributes()){ + for(JavaSpecifiedPersistentAttribute jpa : ((JavaPersistentType)jpt).getAttributes()){ if(jpaFactory.isEmbeddedId(jpa) && JPAEditorUtil.getAttributeTypeNameWithGenerics(jpa).equals(fqn)){ return true; } @@ -203,7 +203,7 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { */ private void deleteFieldFromCompositePKClass(String attrName, JavaPersistentType jpt) { - JavaModifiablePersistentAttribute jpa = jpt.getAttributeNamed(attrName); + JavaSpecifiedPersistentAttribute jpa = jpt.getAttributeNamed(attrName); HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(jpa); if(annotations.contains(JPAEditorConstants.ANNOTATION_ONE_TO_ONE) || annotations.contains(JPAEditorConstants.ANNOTATION_MANY_TO_ONE)){ if(annotations.contains(JPAEditorConstants.ANNOTATION_ID)){ @@ -221,14 +221,14 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { * @param jpa - the attribute to be deleted */ private void deleteFieldFromEmbeddedIDCompositePK(JavaPersistentType jpt, - JavaModifiablePersistentAttribute jpa) { + JavaSpecifiedPersistentAttribute jpa) { Annotation ann = jpa.getResourceAttribute().getAnnotation(MapsId2_0Annotation.ANNOTATION_NAME); if(ann != null) { String attribName = ((MapsId2_0Annotation)ann).getValue(); if(attribName == null) return; JpaArtifactFactory jpaFactory = JpaArtifactFactory.instance(); - for(JavaModifiablePersistentAttribute jpa1 : jpt.getAttributes()){ + for(JavaSpecifiedPersistentAttribute jpa1 : jpt.getAttributes()){ if(jpaFactory.isEmbeddedId(jpa1)){ String fqn = JPAEditorUtil.getAttributeTypeNameWithGenerics(jpa1); if(isDeleteAttributeAllowed(jpt, fqn)){ @@ -276,7 +276,7 @@ public class ClickRemoveAttributeButtonFeature extends DefaultDeleteFeature { private boolean isDeleteAttributeAllowed(JavaPersistentType jpt, String fqn){ Set<JavaPersistentType> jpts = getAllJPTWithSameIDClassOrEmbeddedId(jpt, fqn); for(JavaPersistentType perType : jpts){ - for(JavaModifiablePersistentAttribute jpa : perType.getAttributes()){ + for(JavaSpecifiedPersistentAttribute jpa : perType.getAttributes()){ HashSet<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(jpa); if((annotations.contains(JPAEditorConstants.ANNOTATION_ONE_TO_ONE) || annotations.contains(JPAEditorConstants.ANNOTATION_MANY_TO_ONE)) && (annotations.contains(JPAEditorConstants.ANNOTATION_ID) || annotations.contains(JPAEditorConstants.ANNOTATION_MAPS_ID))){ diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java index 9b1c7a7e98..da0d7ee679 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/CreateIsARelationFeature.java @@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.MappingKeys;
import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -75,7 +75,7 @@ public class CreateIsARelationFeature extends AbstractCreateConnectionFeature { JavaPersistentType subclass = (JavaPersistentType)getPersistentType(context.getTargetAnchor());
if(JpaArtifactFactory.instance().hasOrInheritsPrimaryKey(superclass)){
- for(JavaModifiablePersistentAttribute jpa : subclass.getAttributes()){
+ for(JavaSpecifiedPersistentAttribute jpa : subclass.getAttributes()){
if(jpa.getMappingKey().equals(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY)){
jpa.setMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY);
} else if(jpa.getMappingKey().equals(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY)) {
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java index 1745cc9ce0..bcf725bf9d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DeleteRelationFeature.java @@ -22,7 +22,7 @@ import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.ui.features.DefaultDeleteFeature; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -105,7 +105,7 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ private void deleteEmbeddedRelation(Object businessObjectForPictogramElement) { HasReferanceRelation rel = (HasReferanceRelation)businessObjectForPictogramElement; - JavaModifiablePersistentAttribute attribute = rel.getEmbeddedAnnotatedAttribute(); + JavaSpecifiedPersistentAttribute attribute = rel.getEmbeddedAnnotatedAttribute(); PictogramElement textShape = getFeatureProvider().getPictogramElementForBusinessObject(attribute); if(textShape == null) return; @@ -119,7 +119,7 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ if (rel instanceof IUnidirectionalRelation) { IUnidirectionalRelation relation = (IUnidirectionalRelation)rel; - JavaModifiablePersistentAttribute attribute = relation.getAnnotatedAttribute(); + JavaSpecifiedPersistentAttribute attribute = relation.getAnnotatedAttribute(); PictogramElement textShape = getFeatureProvider().getPictogramElementForBusinessObject(attribute); if(textShape == null) return; @@ -132,14 +132,14 @@ public class DeleteRelationFeature extends DefaultDeleteFeature{ IBidirectionalRelation relation = (IBidirectionalRelation)(rel); ClickRemoveAttributeButtonFeature feat = new ClickRemoveAttributeButtonFeature(getFeatureProvider()); - JavaModifiablePersistentAttribute ownerAttribute = relation.getOwnerAnnotatedAttribute(); + JavaSpecifiedPersistentAttribute ownerAttribute = relation.getOwnerAnnotatedAttribute(); PictogramElement ownerAttributeTextShape = getFeatureProvider().getPictogramElementForBusinessObject(ownerAttribute); if(ownerAttributeTextShape == null) return; IDeleteContext deleteOwnerAttributeContext = new DeleteContext(ownerAttributeTextShape); feat.delete(deleteOwnerAttributeContext, false); - JavaModifiablePersistentAttribute inverseAttribute = relation.getInverseAnnotatedAttribute(); + JavaSpecifiedPersistentAttribute inverseAttribute = relation.getInverseAnnotatedAttribute(); PictogramElement inverseAttributeTextShape = getFeatureProvider().getPictogramElementForBusinessObject(inverseAttribute); if(inverseAttributeTextShape == null) return; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java index 419516b917..af51a762cf 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditAttributeFeature.java @@ -30,7 +30,7 @@ import org.eclipse.graphiti.mm.algorithms.Text; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.jdt.core.JavaConventions; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; @@ -60,7 +60,7 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { public String getInitialValue(IDirectEditingContext context) { PictogramElement pe = context.getPictogramElement(); - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute)getFeatureProvider(). + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute)getFeatureProvider(). getBusinessObjectForPictogramElement(pe); isMethodAnnotated = JpaArtifactFactory.instance().isMethodAnnotated(jpa); Text txt = (Text) pe.getGraphicsAlgorithm().getGraphicsAlgorithmChildren().get(0); @@ -85,8 +85,8 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { private IStatus checkDuplicateAttribute(String value, IDirectEditingContext context) { PictogramElement pe = context.getPictogramElement(); - JavaModifiablePersistentAttribute oldAt = (JavaModifiablePersistentAttribute) getBusinessObjectForPictogramElement(pe); - JavaModifiablePersistentAttribute newAl = ((JavaPersistentType)oldAt.getParent()).getAttributeNamed(value); + JavaSpecifiedPersistentAttribute oldAt = (JavaSpecifiedPersistentAttribute) getBusinessObjectForPictogramElement(pe); + JavaSpecifiedPersistentAttribute newAl = ((JavaPersistentType)oldAt.getParent()).getAttributeNamed(value); if (newAl != null && !newAl.equals(oldAt)) { String message = MessageFormat.format(JPAEditorMessages.DirectEditAttributeFeature_attributeExists, value); return new Status(IStatus.ERROR, JPADiagramEditorPlugin.PLUGIN_ID, message); @@ -104,7 +104,7 @@ public class DirectEditAttributeFeature extends AbstractDirectEditingFeature { if (isMethodAnnotated) value = JPAEditorUtil.produceValidAttributeName(value); PictogramElement pe = context.getPictogramElement(); - JavaModifiablePersistentAttribute oldAt = (JavaModifiablePersistentAttribute) getBusinessObjectForPictogramElement(pe); + JavaSpecifiedPersistentAttribute oldAt = (JavaSpecifiedPersistentAttribute) getBusinessObjectForPictogramElement(pe); IRelation rel = getFeatureProvider().getRelationRelatedToAttribute(oldAt); String inverseJPTName = null; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditJPAEntityFeature.java index daca15f0ce..3750b999c6 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/DirectEditJPAEntityFeature.java @@ -32,7 +32,7 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.jdt.core.Signature; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -135,10 +135,10 @@ public class DirectEditJPAEntityFeature extends AbstractDirectEditingFeature { } }); - Set<JavaModifiablePersistentAttribute> ats = JpaArtifactFactory.instance().getRelatedAttributes(jpt); - Iterator<JavaModifiablePersistentAttribute> it = ats.iterator(); + Set<JavaSpecifiedPersistentAttribute> ats = JpaArtifactFactory.instance().getRelatedAttributes(jpt); + Iterator<JavaSpecifiedPersistentAttribute> it = ats.iterator(); while (it.hasNext()) { - JavaModifiablePersistentAttribute at = it.next(); + JavaSpecifiedPersistentAttribute at = it.next(); PictogramElement pel = getFeatureProvider().getPictogramElementForBusinessObject(at); String newAtName = JPAEditorUtil.decapitalizeFirstLetter(value); if (JpaArtifactFactory.instance().isMethodAnnotated(at)) diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java index 0256ee295e..eaba8d2e47 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedCollectionOfObjectsFeature.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
import org.eclipse.jpt.jpa.core.context.PersistentType;
import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -89,7 +89,7 @@ public class EmbedCollectionOfObjectsFeature extends AbstractCreateConnectionFea mapKeyType = "java.lang.String"; //$NON-NLS-1$
}
- JavaModifiablePersistentAttribute embeddedAttribute = JPAEditorUtil.addAnnotatedAttribute(getFeatureProvider(), embeddingEntity, embeddable, true, mapKeyType);
+ JavaSpecifiedPersistentAttribute embeddedAttribute = JPAEditorUtil.addAnnotatedAttribute(getFeatureProvider(), embeddingEntity, embeddable, true, mapKeyType);
embeddedAttribute.setMappingKey(MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY);
embeddedAttribute.getResourceAttribute().addAnnotation(ElementCollection2_0Annotation.ANNOTATION_NAME);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java index e9f2a9dc88..241056c97d 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/EmbedSingleObjectFeature.java @@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Entity;
import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
import org.eclipse.jpt.jpa.core.context.PersistentType;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -78,7 +78,7 @@ public class EmbedSingleObjectFeature extends AbstractCreateConnectionFeature { JavaPersistentType embeddingEntity = (JavaPersistentType)getPersistentType(context.getSourceAnchor());
JavaPersistentType embeddable = (JavaPersistentType)getPersistentType(context.getTargetAnchor());
- JavaModifiablePersistentAttribute embeddedAttribute = JPAEditorUtil.addAnnotatedAttribute(getFeatureProvider(), embeddingEntity, embeddable, false, null);
+ JavaSpecifiedPersistentAttribute embeddedAttribute = JPAEditorUtil.addAnnotatedAttribute(getFeatureProvider(), embeddingEntity, embeddable, false, null);
embeddedAttribute.setMappingKey(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY);
embeddedAttribute.getResourceAttribute().addAnnotation(EmbeddedAnnotation.ANNOTATION_NAME);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java index b3901033a4..caea634a59 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalAddAttributeFeature.java @@ -29,7 +29,7 @@ import org.eclipse.graphiti.mm.algorithms.Text; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.services.Graphiti; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.JPAEditorImageProvider; @@ -54,7 +54,7 @@ public class GraphicalAddAttributeFeature extends AbstractAddShapeFeature { ted.getCommandStack().execute(new RecordingCommand(ted) { @Override protected void doExecute() { - JavaModifiablePersistentAttribute newAttr = (JavaModifiablePersistentAttribute) context.getNewObject(); + JavaSpecifiedPersistentAttribute newAttr = (JavaSpecifiedPersistentAttribute) context.getNewObject(); String txt = JPAEditorUtil.getText(newAttr); HashSet<String> annots = JpaArtifactFactory.instance().getAnnotationNames(newAttr); ContainerShape textShape = null; diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalRemoveAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalRemoveAttributeFeature.java index dad775d9fd..4a29f255f9 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalRemoveAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/GraphicalRemoveAttributeFeature.java @@ -29,7 +29,7 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.graphiti.services.Graphiti; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.GraphicsUpdater; @@ -93,7 +93,7 @@ public class GraphicalRemoveAttributeFeature extends AbstractCustomFeature { AddContext addContext = new AddContext(); addContext.setTargetContainer(entityShape); - for (JavaModifiablePersistentAttribute attribute : javaPersistentType.getAttributes()) { + for (JavaSpecifiedPersistentAttribute attribute : javaPersistentType.getAttributes()) { addContext.setNewObject(attribute); graphicalAdd.execute(addContext); getFeatureProvider().renewAttributeJoiningStrategyPropertyListener(attribute); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorAttributeTypeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorAttributeTypeFeature.java index 4aef05d89c..8085c61899 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorAttributeTypeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorAttributeTypeFeature.java @@ -27,7 +27,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.dialog.SelectTypeDialog; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; @@ -52,9 +52,9 @@ public class RefactorAttributeTypeFeature extends AbstractCustomFeature { public void execute(ICustomContext context) { PictogramElement pe = context.getPictogramElements()[0]; Object bo = getFeatureProvider().getBusinessObjectForPictogramElement(pe); - if ((bo == null) || (!(bo instanceof JavaModifiablePersistentAttribute))) + if ((bo == null) || (!(bo instanceof JavaSpecifiedPersistentAttribute))) return; - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute)bo; + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute)bo; String typeName = JPAEditorUtil.getAttributeTypeNameWithGenerics(jpa); String msg = MessageFormat.format(JPAEditorMessages.SelectTypeDialog_chooseAttributeTypeDialogText, jpa.getName(), JPAEditorUtil.returnSimpleName(((PersistentType)jpa.getParent()).getName())); @@ -74,7 +74,7 @@ public class RefactorAttributeTypeFeature extends AbstractCustomFeature { JpaArtifactFactory.instance().deleteAttribute((JavaPersistentType)jpa.getParent(), jpa.getName(), getFeatureProvider()); - JavaModifiablePersistentAttribute newAt = JpaArtifactFactory.instance().makeNewAttribute(getFeatureProvider(), (JavaPersistentType)jpa.getParent(), + JavaSpecifiedPersistentAttribute newAt = JpaArtifactFactory.instance().makeNewAttribute(getFeatureProvider(), (JavaPersistentType)jpa.getParent(), null, jpa.getName(), newTypeName, jpa.getName(), newTypeName, attributeTypeTypeNames, annotations, false); getFeatureProvider().replaceAttribute(jpa, newAt); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java index 6b391095f2..4aa18c9ab8 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RefactorEntityFeature.java @@ -50,7 +50,7 @@ import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; @@ -68,7 +68,7 @@ import org.eclipse.ui.IWorkbenchSite; public abstract class RefactorEntityFeature extends AbstractCustomFeature { - protected Set<JavaModifiablePersistentAttribute> ats = null; + protected Set<JavaSpecifiedPersistentAttribute> ats = null; protected boolean hasNameAnnotation = false; public RefactorEntityFeature(IFeatureProvider fp) { @@ -193,10 +193,10 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { GraphicsUpdater.updateHeader((ContainerShape)pict, newJPT.getSimpleName()); linkNewElement(oldJPT, pict, fp, newJPT); - for(JavaModifiablePersistentAttribute oldAttr : oldJPT.getAttributes()){ + for(JavaSpecifiedPersistentAttribute oldAttr : oldJPT.getAttributes()){ PictogramElement attrPict = fp.getPictogramElementForBusinessObject(oldAttr); if(attrPict != null){ - for(JavaModifiablePersistentAttribute newAttr : newJPT.getAttributes()){ + for(JavaSpecifiedPersistentAttribute newAttr : newJPT.getAttributes()){ if(newAttr.getName().equals(oldAttr.getName())){ linkNewElement(oldAttr, attrPict, fp, newAttr); } @@ -284,18 +284,18 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { s.release(); if ((ats == null) || hasNameAnnotation) return; - final Iterator<JavaModifiablePersistentAttribute> iter = ats.iterator(); + final Iterator<JavaSpecifiedPersistentAttribute> iter = ats.iterator(); Runnable r = new Runnable() { public void run() { Hashtable<String, String> atOldToNewName = new Hashtable<String, String>(); - Set<JavaModifiablePersistentAttribute> newSelfAts = new HashSet<JavaModifiablePersistentAttribute>(); + Set<JavaSpecifiedPersistentAttribute> newSelfAts = new HashSet<JavaSpecifiedPersistentAttribute>(); while (iter.hasNext()) { - JavaModifiablePersistentAttribute at = iter.next(); + JavaSpecifiedPersistentAttribute at = iter.next(); JavaPersistentType atParent = (JavaPersistentType) at.getParent(); ICompilationUnit cu = getFeatureProvider().getCompilationUnit(atParent); if (!cu.exists()) { - at = (JavaModifiablePersistentAttribute)at.getPersistenceUnit().getPersistentType(newJptName).getAttributeNamed(at.getName()); - JavaModifiablePersistentAttribute newAt = null; + at = (JavaSpecifiedPersistentAttribute)at.getPersistenceUnit().getPersistentType(newJptName).getAttributeNamed(at.getName()); + JavaSpecifiedPersistentAttribute newAt = null; try { newAt = JpaArtifactFactory.instance().renameAttribute(atParent, at.getName(), JPAEditorUtil.returnSimpleName(newJptName), newJptName, getFeatureProvider()); } catch (InterruptedException e) { @@ -311,9 +311,9 @@ public abstract class RefactorEntityFeature extends AbstractCustomFeature { } } } - Iterator<JavaModifiablePersistentAttribute> itr = newSelfAts.iterator(); + Iterator<JavaSpecifiedPersistentAttribute> itr = newSelfAts.iterator(); while (itr.hasNext()) { - JavaModifiablePersistentAttribute at = itr.next(); + JavaSpecifiedPersistentAttribute at = itr.next(); JavaAttributeMapping m = at.getMapping(); Annotation mappingAnnotation = m.getMappingAnnotation(); if (mappingAnnotation == null) diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java index a9127df395..630bd24f1f 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAndSaveEntityFeature.java @@ -32,7 +32,7 @@ import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory; @@ -55,7 +55,7 @@ public class RemoveAndSaveEntityFeature extends DefaultRemoveFeature { for (int i = lst.size() - 1; i >= 0; i--) { Shape textShape = lst.get(i); Object o = fp.getBusinessObjectForPictogramElement(textShape); - if ((o != null) && (o instanceof JavaModifiablePersistentAttribute)) { + if ((o != null) && (o instanceof JavaSpecifiedPersistentAttribute)) { shapesForDeletion.add(textShape); } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java index 1d42c2c96a..4a6d81a316 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveAttributeFeature.java @@ -28,7 +28,7 @@ import org.eclipse.graphiti.features.impl.DefaultRemoveFeature; import org.eclipse.graphiti.mm.pictograms.Connection; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -89,8 +89,8 @@ public class RemoveAttributeFeature extends DefaultRemoveFeature { if(bo == null) return; - if (bo instanceof JavaModifiablePersistentAttribute) { - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute) bo; + if (bo instanceof JavaSpecifiedPersistentAttribute) { + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute) bo; HashSet<String> ignores = ((JPAEditorFeatureProvider) getFeatureProvider()).getAddIgnore(); if (!ignores.isEmpty()) { diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java index 9297f6205a..909fae7555 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/feature/RemoveJPAEntityFeature.java @@ -33,7 +33,7 @@ import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -66,7 +66,7 @@ public class RemoveJPAEntityFeature extends DefaultRemoveFeature { for (int i = lst.size() - 1; i >= 0; i--) { Shape textShape = lst.get(i); Object o = fp.getBusinessObjectForPictogramElement(textShape); - if ((o != null) && (o instanceof JavaModifiablePersistentAttribute)) { + if ((o != null) && (o instanceof JavaSpecifiedPersistentAttribute)) { shapesForDeletion.add(textShape); } } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorFeatureProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorFeatureProvider.java index 0f0ca84d8c..a8526f23ea 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorFeatureProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/IJPAEditorFeatureProvider.java @@ -29,7 +29,7 @@ import org.eclipse.graphiti.mm.pictograms.Diagram; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.graphiti.services.IPeService; import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util.IModelIntegrationUtil; @@ -62,9 +62,9 @@ public interface IJPAEditorFeatureProvider extends IFeatureProvider{ public Object remove(String key, boolean save); - public IRelation getRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa); + public IRelation getRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa); - public HasReferanceRelation getEmbeddedRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa); + public HasReferanceRelation getEmbeddedRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa); public Object getBusinessObjectForKey(String key); @@ -93,9 +93,9 @@ public interface IJPAEditorFeatureProvider extends IFeatureProvider{ public int decreaseAttribsNum(Shape sh); - public void replaceAttribute(JavaModifiablePersistentAttribute oldAt, JavaModifiablePersistentAttribute newAt); + public void replaceAttribute(JavaSpecifiedPersistentAttribute oldAt, JavaSpecifiedPersistentAttribute newAt); - public void renewAttributeJoiningStrategyPropertyListener(JavaModifiablePersistentAttribute jpa); + public void renewAttributeJoiningStrategyPropertyListener(JavaSpecifiedPersistentAttribute jpa); public IPeService getPeService(); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java index 950569b667..7b2959ad29 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorFeatureProvider.java @@ -71,10 +71,10 @@ import org.eclipse.jdt.internal.core.CompilationUnit; import org.eclipse.jdt.internal.core.SourceType; import org.eclipse.jpt.jpa.core.JpaModel; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -297,7 +297,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return new AddRelationFeature(this); } else if (newObj instanceof HasReferanceRelation) { return new AddHasReferenceRelationFeature(this); - } else if (newObj instanceof ModifiablePersistentAttribute) { + } else if (newObj instanceof SpecifiedPersistentAttribute) { if (Diagram.class.isInstance(context.getTargetContainer())) { return null; } @@ -331,7 +331,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements } else if ((bo instanceof AbstractRelation) || (bo instanceof HasReferanceRelation || (bo instanceof IsARelation))) { return new DeleteRelationFeature(this); - } else if (bo instanceof JavaModifiablePersistentAttribute) { + } else if (bo instanceof JavaSpecifiedPersistentAttribute) { return new ClickRemoveAttributeButtonFeature(this); } return null; @@ -470,7 +470,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return super.getDirectEditingFeature(context); Object bo = getBusinessObjectForPictogramElement(pe); if (bo != null) { - if (bo instanceof JavaModifiablePersistentAttribute) { + if (bo instanceof JavaSpecifiedPersistentAttribute) { return new DirectEditAttributeFeature(this); } } @@ -487,7 +487,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return super.getDirectEditingFeature(context); } - public void renewAttributeJoiningStrategyPropertyListener(JavaModifiablePersistentAttribute jpa) { + public void renewAttributeJoiningStrategyPropertyListener(JavaSpecifiedPersistentAttribute jpa) { ((JPASolver)getIndependenceSolver()).renewAttributeJoiningStrategyPropertyListener(jpa); } @@ -595,7 +595,7 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return ((JPASolver)getIndependenceSolver()).containsKey(name); } - public void replaceAttribute(final JavaModifiablePersistentAttribute oldAt, final JavaModifiablePersistentAttribute newAt) { + public void replaceAttribute(final JavaSpecifiedPersistentAttribute oldAt, final JavaSpecifiedPersistentAttribute newAt) { final PictogramElement pe = this.getPictogramElementForBusinessObject(oldAt); if (pe == null) { //System.err.println("PictogramElement is null\n"); @@ -639,15 +639,15 @@ public class JPAEditorFeatureProvider extends DefaultFeatureProvider implements return (getBusinessObjectForKey(id) != null); } - public boolean isRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa) { + public boolean isRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa) { return ((JPASolver)getIndependenceSolver()).isRelationRelatedToAttribute(jpa); } - public IRelation getRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa) { + public IRelation getRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa) { return ((JPASolver)getIndependenceSolver()).getRelationRelatedToAttribute(jpa, this); } - public HasReferanceRelation getEmbeddedRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa) { + public HasReferanceRelation getEmbeddedRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa) { return ((JPASolver)getIndependenceSolver()).getEmbeddedRelationToAttribute(jpa); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java index 20c3fc8c77..6c3d8b5298 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/provider/JPAEditorToolBehaviorProvider.java @@ -60,7 +60,7 @@ import org.eclipse.graphiti.tb.IContextMenuEntry; import org.eclipse.graphiti.tb.IDecorator; import org.eclipse.graphiti.tb.ImageDecorator; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin; import org.eclipse.jpt.jpadiagrameditor.ui.internal.facade.EclipseFacade; @@ -466,8 +466,8 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { } return JPAEditorUtil.getTooltipText((JavaPersistentType)bo, superPersistentTypeName); } else { - if (bo instanceof JavaModifiablePersistentAttribute) { - return JPAEditorUtil.getTooltipText((JavaModifiablePersistentAttribute)bo); + if (bo instanceof JavaSpecifiedPersistentAttribute) { + return JPAEditorUtil.getTooltipText((JavaSpecifiedPersistentAttribute)bo); } } } @@ -683,8 +683,8 @@ public class JPAEditorToolBehaviorProvider extends DefaultToolBehaviorProvider { PictogramElement pe = context.getPictogramElements()[0]; Object bo = getFeatureProvider().getBusinessObjectForPictogramElement( pe); - if (bo instanceof JavaModifiablePersistentAttribute) { - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute) bo; + if (bo instanceof JavaSpecifiedPersistentAttribute) { + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute) bo; IFile file = (IFile) jpa.getResource(); try { file.setSessionProperty(new QualifiedName(null, JPAEditorMatchingStrategy.DOUBLE_CLICK), "true"); //$NON-NLS-1$ diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java index 697fef109c..dd272dbedb 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/AbstractRelation.java @@ -17,15 +17,15 @@ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; import java.util.Hashtable; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; abstract public class AbstractRelation implements IRelation { protected final static String SEPARATOR = ";"; //$NON-NLS-1$ protected JavaPersistentType owner; protected JavaPersistentType inverse; - protected JavaModifiablePersistentAttribute ownerAnnotatedAttribute; - protected JavaModifiablePersistentAttribute inverseAnnotatedAttribute; + protected JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute; + protected JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute; protected String ownerAttributeName; protected String inverseAttributeName; @@ -61,21 +61,21 @@ abstract public class AbstractRelation implements IRelation { return inverse; } - public JavaModifiablePersistentAttribute getInverseAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } - public JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } public void setOwnerAnnotatedAttribute( - JavaModifiablePersistentAttribute ownerAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } public void setInverseAnnotatedAttribute( - JavaModifiablePersistentAttribute inverseAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java index 282c5bfee7..9e1eccb9aa 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/HasReferanceRelation.java @@ -21,7 +21,7 @@ import java.util.Hashtable; import org.eclipse.graphiti.mm.pictograms.Anchor;
import org.eclipse.graphiti.mm.pictograms.Connection;
import org.eclipse.graphiti.mm.pictograms.ContainerShape;
-import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute;
+import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider;
import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants;
@@ -34,7 +34,7 @@ public abstract class HasReferanceRelation { public final static Hashtable<HasReferenceType, String> relTypeToIdPart = new Hashtable<HasReferenceType, String>();
- private JavaModifiablePersistentAttribute embeddedAnnotatedAttribute;
+ private JavaSpecifiedPersistentAttribute embeddedAnnotatedAttribute;
public static enum HasReferenceType {
SINGLE, COLLECTION
@@ -96,11 +96,11 @@ public abstract class HasReferanceRelation { public abstract HasReferenceType getReferenceType();
- public JavaModifiablePersistentAttribute getEmbeddedAnnotatedAttribute() {
+ public JavaSpecifiedPersistentAttribute getEmbeddedAnnotatedAttribute() {
return embeddedAnnotatedAttribute;
}
- public void setEmbeddedAnnotatedAttribute(JavaModifiablePersistentAttribute embeddedAnnotatedAttribute) {
+ public void setEmbeddedAnnotatedAttribute(JavaSpecifiedPersistentAttribute embeddedAnnotatedAttribute) {
this.embeddedAnnotatedAttribute = embeddedAnnotatedAttribute;
}
}
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IBidirectionalRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IBidirectionalRelation.java index 4de452cbd3..a95bdb2054 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IBidirectionalRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IBidirectionalRelation.java @@ -15,16 +15,16 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; public interface IBidirectionalRelation extends IRelation { - public abstract JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute(); + public abstract JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute(); - public abstract JavaModifiablePersistentAttribute getInverseAnnotatedAttribute(); + public abstract JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute(); - public abstract void setOwnerAnnotatedAttribute(JavaModifiablePersistentAttribute ownerAnnotatedAttribute); + public abstract void setOwnerAnnotatedAttribute(JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute); - public abstract void setInverseAnnotatedAttribute(JavaModifiablePersistentAttribute inverseAnnotatedAttribute); + public abstract void setInverseAnnotatedAttribute(JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute); }
\ No newline at end of file diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IRelation.java index 59b19a7c7c..3384a71180 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; public interface IRelation { @@ -34,17 +34,17 @@ public interface IRelation { public abstract JavaPersistentType getInverse(); - public void setOwnerAnnotatedAttribute(JavaModifiablePersistentAttribute ownerAnnotatedAttribute); + public void setOwnerAnnotatedAttribute(JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute); - public JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute(); + public JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute(); - public void setInverseAnnotatedAttribute(JavaModifiablePersistentAttribute inverseAnnotatedAttribute); + public void setInverseAnnotatedAttribute(JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute); public void setOwnerAttributeName(String ownerAttributeName); public void setInverseAttributeName(String inverseAttributeName); - public abstract JavaModifiablePersistentAttribute getInverseAnnotatedAttribute(); + public abstract JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute(); public abstract String getOwnerAttributeName(); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IUnidirectionalRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IUnidirectionalRelation.java index 4c08330ba6..d2a0327b48 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IUnidirectionalRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/IUnidirectionalRelation.java @@ -15,12 +15,12 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; public interface IUnidirectionalRelation extends IRelation { - public abstract JavaModifiablePersistentAttribute getAnnotatedAttribute(); + public abstract JavaSpecifiedPersistentAttribute getAnnotatedAttribute(); - public abstract void setAnnotatedAttribute(JavaModifiablePersistentAttribute at); + public abstract void setAnnotatedAttribute(JavaSpecifiedPersistentAttribute at); }
\ No newline at end of file diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java index 63cb906501..187a3faf84 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyBiDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -42,13 +42,13 @@ public class ManyToManyBiDirRelation extends ManyToManyRelation implements IBidi * @see org.eclipse.jpt.jpadiagrameditor.ui.relations.BidirectionalRelation#getOwnerAnnotatedAttribute() */ @Override - public JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } @Override public void setOwnerAnnotatedAttribute( - JavaModifiablePersistentAttribute ownerAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } @@ -56,13 +56,13 @@ public class ManyToManyBiDirRelation extends ManyToManyRelation implements IBidi * @see org.eclipse.jpt.jpadiagrameditor.ui.relations.BidirectionalRelation#getInverseAnnotatedAttribute() */ @Override - public JavaModifiablePersistentAttribute getInverseAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } @Override public void setInverseAnnotatedAttribute( - JavaModifiablePersistentAttribute inverseAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java index 257712d4f5..356b726ce6 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToManyUniDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -35,11 +35,11 @@ public class ManyToManyUniDirRelation extends ManyToManyRelation implements IUni createRelation(fp); } - public JavaModifiablePersistentAttribute getAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getAnnotatedAttribute() { return ownerAnnotatedAttribute; } - public void setAnnotatedAttribute(JavaModifiablePersistentAttribute annotatedAttribute) { + public void setAnnotatedAttribute(JavaSpecifiedPersistentAttribute annotatedAttribute) { this.ownerAnnotatedAttribute = annotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java index 5fb13eabec..467a9f3a9c 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneBiDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -40,22 +40,22 @@ public class ManyToOneBiDirRelation extends ManyToOneRelation implements IBidir } @Override - public JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } @Override - public void setOwnerAnnotatedAttribute( JavaModifiablePersistentAttribute ownerAnnotatedAttribute) { + public void setOwnerAnnotatedAttribute( JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } @Override - public JavaModifiablePersistentAttribute getInverseAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } @Override - public void setInverseAnnotatedAttribute(JavaModifiablePersistentAttribute inverseAnnotatedAttribute) { + public void setInverseAnnotatedAttribute(JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java index 435b7d1720..15f16428cd 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/ManyToOneUniDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorUtil; @@ -34,11 +34,11 @@ public class ManyToOneUniDirRelation extends ManyToOneRelation implements IUnidi createRelation(fp, isDerivedIdFeature); } - public JavaModifiablePersistentAttribute getAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getAnnotatedAttribute() { return ownerAnnotatedAttribute; } - public void setAnnotatedAttribute(JavaModifiablePersistentAttribute annotatedAttribute) { + public void setAnnotatedAttribute(JavaSpecifiedPersistentAttribute annotatedAttribute) { this.ownerAnnotatedAttribute = annotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java index e6661a8e7e..2635cbc1d7 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToManyUniDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.propertypage.JPADiagramPropertyPage; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -35,11 +35,11 @@ public class OneToManyUniDirRelation extends OneToManyRelation implements IUnidi createRelation(fp); } - public JavaModifiablePersistentAttribute getAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getAnnotatedAttribute() { return ownerAnnotatedAttribute; } - public void setAnnotatedAttribute(JavaModifiablePersistentAttribute annotatedAttribute) { + public void setAnnotatedAttribute(JavaSpecifiedPersistentAttribute annotatedAttribute) { this.ownerAnnotatedAttribute = annotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java index ac438b8988..9cbb15f9de 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneBiDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorUtil; @@ -37,24 +37,24 @@ public class OneToOneBiDirRelation extends OneToOneRelation implements IBidirect } @Override - public JavaModifiablePersistentAttribute getOwnerAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getOwnerAnnotatedAttribute() { return ownerAnnotatedAttribute; } @Override public void setOwnerAnnotatedAttribute( - JavaModifiablePersistentAttribute ownerAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute ownerAnnotatedAttribute) { this.ownerAnnotatedAttribute = ownerAnnotatedAttribute; } @Override - public JavaModifiablePersistentAttribute getInverseAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getInverseAnnotatedAttribute() { return inverseAnnotatedAttribute; } @Override public void setInverseAnnotatedAttribute( - JavaModifiablePersistentAttribute inverseAnnotatedAttribute) { + JavaSpecifiedPersistentAttribute inverseAnnotatedAttribute) { this.inverseAnnotatedAttribute = inverseAnnotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java index ecb4c9ac52..011caf1c8b 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/relations/OneToOneUniDirRelation.java @@ -15,7 +15,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpadiagrameditor.ui.internal.relations; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorUtil; @@ -34,11 +34,11 @@ public class OneToOneUniDirRelation extends OneToOneRelation implements IUnidire createRelation(fp, isDerivedIdFeature); } - public JavaModifiablePersistentAttribute getAnnotatedAttribute() { + public JavaSpecifiedPersistentAttribute getAnnotatedAttribute() { return ownerAnnotatedAttribute; } - public void setAnnotatedAttribute(JavaModifiablePersistentAttribute annotatedAttribute) { + public void setAnnotatedAttribute(JavaSpecifiedPersistentAttribute annotatedAttribute) { this.ownerAnnotatedAttribute = annotatedAttribute; } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntityChangeListener.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntityChangeListener.java index d82eb7a1e1..76d9935fac 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntityChangeListener.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/EntityChangeListener.java @@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.core.context.MappedByRelationship; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -151,7 +151,7 @@ public class EntityChangeListener extends Thread { String oldMappedBy = jptAndAttrib[3]; JavaPersistentType jpt = (JavaPersistentType)pu.getPersistentType(entityName); if (jpt != null) { - JavaModifiablePersistentAttribute jpa = jpt.getAttributeNamed(attribName); + JavaSpecifiedPersistentAttribute jpa = jpt.getAttributeNamed(attribName); if (jpa != null) { JavaAttributeMapping mapping = jpa.getMapping(); if (OwnableRelationshipMappingAnnotation.class.isInstance(mapping.getMappingAnnotation())) { diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java index c3f94dd370..999c330a21 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPAEditorUtil.java @@ -81,7 +81,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -161,7 +161,7 @@ public class JPAEditorUtil { return getAnchor((ContainerShape)pe); } - public static String getText(JavaModifiablePersistentAttribute at) { + public static String getText(JavaSpecifiedPersistentAttribute at) { return at.getName(); } @@ -187,7 +187,7 @@ public class JPAEditorUtil { } - public static String getAttributeTypeName(JavaModifiablePersistentAttribute at) { + public static String getAttributeTypeName(JavaSpecifiedPersistentAttribute at) { return getAttributeTypeName(at.getResourceAttribute()); } @@ -195,7 +195,7 @@ public class JPAEditorUtil { return at.getTypeBinding().getQualifiedName(); } - public static String getAttributeTypeNameWithGenerics(JavaModifiablePersistentAttribute at) { + public static String getAttributeTypeNameWithGenerics(JavaSpecifiedPersistentAttribute at) { return getAttributeTypeNameWithGenerics(at.getResourceAttribute()); } @@ -1303,7 +1303,7 @@ public class JPAEditorUtil { } - public static String getTooltipText(JavaModifiablePersistentAttribute at) { + public static String getTooltipText(JavaSpecifiedPersistentAttribute at) { String res = getAttributeTypeName(at); return MessageFormat.format(JPAEditorMessages.JPAEditorUtil_typeTooltipText, new Object[] { res }); } @@ -1404,7 +1404,7 @@ public class JPAEditorUtil { return h1.equals(h2); } - public static JavaModifiablePersistentAttribute addAnnotatedAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType referencingJPT, + public static JavaSpecifiedPersistentAttribute addAnnotatedAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType referencingJPT, JavaPersistentType referencedJPT, boolean isCollection, String mapKeyType){ String name = returnSimpleName(referencedJPT.getName()); diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java index e7cbaf48c4..ff29acbf85 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JPASolver.java @@ -89,7 +89,7 @@ import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.OptionalMapping; -import org.eclipse.jpt.jpa.core.context.ModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.SpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; @@ -99,7 +99,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; @@ -134,10 +134,10 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { private Hashtable<String, Object> keyToBO; private WeakHashMap<JpaProject, WeakReference<CollectionChangeListener>> projectToEntityListener; private WeakHashMap<JavaPersistentType, WeakReference<PropertyChangeListener>> entityToPropListener; - private WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributePropertyChangeListener>> attributeToPropListener; - private WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeMappingOptionalityChangeListener>> attributeMappingOptionalityToPropListener; - private WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeJoiningStrategyPropertyChangeListener>> attributeJoiningStrategyToPropListener; - private WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeRelationshipReferencePropertyChangeListener>> attributeRelationshipReferenceToPropListener; + private WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributePropertyChangeListener>> attributeToPropListener; + private WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeMappingOptionalityChangeListener>> attributeMappingOptionalityToPropListener; + private WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeJoiningStrategyPropertyChangeListener>> attributeJoiningStrategyToPropListener; + private WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeRelationshipReferencePropertyChangeListener>> attributeRelationshipReferenceToPropListener; private WeakHashMap<JavaPersistentType, WeakReference<ListChangeListener>> entityToAtListener; private WeakHashMap<JavaPersistentType, WeakReference<StateChangeListener>> entityToStateListener; private EntityChangeListener entityNameListener; @@ -181,10 +181,10 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { keyToBO = new Hashtable<String, Object>(); projectToEntityListener = new WeakHashMap<JpaProject, WeakReference<CollectionChangeListener>>(); entityToPropListener = new WeakHashMap<JavaPersistentType, WeakReference<PropertyChangeListener>>(); - attributeToPropListener = new WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributePropertyChangeListener>>(); - attributeMappingOptionalityToPropListener = new WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeMappingOptionalityChangeListener>>(); - attributeJoiningStrategyToPropListener = new WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeJoiningStrategyPropertyChangeListener>>(); - attributeRelationshipReferenceToPropListener = new WeakHashMap<JavaModifiablePersistentAttribute, WeakReference<AttributeRelationshipReferencePropertyChangeListener>>(); + attributeToPropListener = new WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributePropertyChangeListener>>(); + attributeMappingOptionalityToPropListener = new WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeMappingOptionalityChangeListener>>(); + attributeJoiningStrategyToPropListener = new WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeJoiningStrategyPropertyChangeListener>>(); + attributeRelationshipReferenceToPropListener = new WeakHashMap<JavaSpecifiedPersistentAttribute, WeakReference<AttributeRelationshipReferencePropertyChangeListener>>(); entityToAtListener = new WeakHashMap<JavaPersistentType, WeakReference<ListChangeListener>>(); entityToStateListener = new WeakHashMap<JavaPersistentType, WeakReference<StateChangeListener>>(); entityNameListener = new EntityChangeListener(this); @@ -294,8 +294,8 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { return ((HasReferanceRelation)bo).getId(); } else if (bo instanceof IsARelation) { return ((IsARelation)bo).getId(); - } else if (bo instanceof JavaModifiablePersistentAttribute) { - JavaModifiablePersistentAttribute at = (JavaModifiablePersistentAttribute) bo; + } else if (bo instanceof JavaSpecifiedPersistentAttribute) { + JavaSpecifiedPersistentAttribute at = (JavaSpecifiedPersistentAttribute) bo; return (((PersistentType)at.getParent()).getName() + "-" + at.getName()); //$NON-NLS-1$ } return bo.toString(); @@ -357,8 +357,8 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } else if (bo instanceof IsARelation) { IsARelation rel = (IsARelation) bo; attribToIsARel.put(produceKeyForIsARel(rel), rel); - } else if (bo instanceof JavaModifiablePersistentAttribute) { - addPropertiesListenerToAttribute((JavaModifiablePersistentAttribute)bo); + } else if (bo instanceof JavaSpecifiedPersistentAttribute) { + addPropertiesListenerToAttribute((JavaSpecifiedPersistentAttribute)bo); } } @@ -368,7 +368,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { Object o = keyToBO.remove(key); if (o instanceof JavaPersistentType) { JavaPersistentType jpt = (JavaPersistentType) o; - for (JavaModifiablePersistentAttribute at : jpt.getAttributes()) { + for (JavaSpecifiedPersistentAttribute at : jpt.getAttributes()) { String k = getKeyForBusinessObject(at); remove(k); } @@ -397,8 +397,8 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } else if (o instanceof IsARelation) { IsARelation rel = (IsARelation) o; attribToIsARel.remove(produceKeyForIsARel(rel)); - } else if (o instanceof JavaModifiablePersistentAttribute) { - removeListenersFromAttribute((JavaModifiablePersistentAttribute)o); + } else if (o instanceof JavaSpecifiedPersistentAttribute) { + removeListenersFromAttribute((JavaSpecifiedPersistentAttribute)o); } return o; } @@ -407,12 +407,12 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { return util.getCompilationUnit(jpt); } - public boolean isRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa) { + public boolean isRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa) { String key = produceKeyForRel((JavaPersistentType)jpa.getParent(), jpa.getName()); return attribToRel.containsKey(key); } - public IRelation getRelationRelatedToAttribute(JavaModifiablePersistentAttribute jpa, IJPAEditorFeatureProvider fp) { + public IRelation getRelationRelatedToAttribute(JavaSpecifiedPersistentAttribute jpa, IJPAEditorFeatureProvider fp) { String key = findRelationshipKey(jpa, fp); return attribToRel.get(key); } @@ -426,11 +426,11 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { * that consists of the name of the attribute which will be renamed and the name of the attribute in the embeddable class. If such an attribute * exists, the unique key for the existing relationship must be ganerated by the target entity and the name of the found attribute. * Otherwise the key must be generated by the name of the attribute that will be renamed and its parent entity. - * @param jpa - the {@link JavaModifiablePersistentAttribute} which will be renamed + * @param jpa - the {@link JavaSpecifiedPersistentAttribute} which will be renamed * @param fp * @return the unique key for the relationship. */ - private String findRelationshipKey(JavaModifiablePersistentAttribute jpa, IJPAEditorFeatureProvider fp){ + private String findRelationshipKey(JavaSpecifiedPersistentAttribute jpa, IJPAEditorFeatureProvider fp){ JpaArtifactFactory jpaFactory = JpaArtifactFactory.instance(); if(jpaFactory.isEmbeddedAttribute(jpa)){ Annotation embeddedAn = null; @@ -441,7 +441,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { JavaPersistentType embeddableClass = jpaFactory.findJPT(jpa, fp, embeddedAn); if(embeddableClass == null) return ""; //$NON-NLS-1$ - for (JavaModifiablePersistentAttribute relEntAt : embeddableClass.getAttributes()) { + for (JavaSpecifiedPersistentAttribute relEntAt : embeddableClass.getAttributes()) { IResource r = relEntAt.getParent().getResource(); if (!r.exists()) throw new RuntimeException(); @@ -452,7 +452,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { JavaPersistentType jpt = jpaFactory.findJPT(relEntAt, fp, an); if(jpt == null) return ""; //$NON-NLS-1$ - for(JavaModifiablePersistentAttribute attribute : jpt.getAttributes()){ + for(JavaSpecifiedPersistentAttribute attribute : jpt.getAttributes()){ Annotation[] inverseAnns = jpaFactory.getAnnotations(attribute); for(Annotation inverseAn : inverseAnns){ String inverseAnName = JPAEditorUtil.returnSimpleName(inverseAn.getAnnotationName()); @@ -481,7 +481,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - public HasReferanceRelation getEmbeddedRelationToAttribute(JavaModifiablePersistentAttribute jpa) { + public HasReferanceRelation getEmbeddedRelationToAttribute(JavaSpecifiedPersistentAttribute jpa) { String key = produceKeyForRel((JavaPersistentType)jpa.getParent(), jpa.getName()); return attribToEmbeddedRel.get(key); } @@ -490,12 +490,12 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { return keyToBO.values(); } - public void renewAttributeMappingPropListener(JavaModifiablePersistentAttribute jpa) { + public void renewAttributeMappingPropListener(JavaSpecifiedPersistentAttribute jpa) { renewAttributeJoiningStrategyPropertyListener(jpa); renewAttributeMappingOptPropListener(jpa); } - public void renewAttributeJoiningStrategyPropertyListener(JavaModifiablePersistentAttribute jpa) { + public void renewAttributeJoiningStrategyPropertyListener(JavaSpecifiedPersistentAttribute jpa) { AttributeJoiningStrategyPropertyChangeListener lsn = null; if (attributeJoiningStrategyToPropListener == null) return; @@ -525,7 +525,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - public void renewAttributeMappingOptPropListener(JavaModifiablePersistentAttribute jpa) { + public void renewAttributeMappingOptPropListener(JavaSpecifiedPersistentAttribute jpa) { AttributeMappingOptionalityChangeListener lsn = null; WeakReference<AttributeMappingOptionalityChangeListener> ref = attributeMappingOptionalityToPropListener.remove(jpa); if (ref != null) @@ -602,27 +602,27 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } } - private void addPropertiesListenerToAttribute(JavaModifiablePersistentAttribute jpa) { + private void addPropertiesListenerToAttribute(JavaSpecifiedPersistentAttribute jpa) { addPropertiesListenerToAttributeItself(jpa); addPropertiesListenerToJoiningStrategy(jpa); addPropertiesListenerToRelationshipReference(jpa); addOptPropListenerToAttributeMapping(jpa); } - private void addPropertiesListenerToAttributeItself(JavaModifiablePersistentAttribute jpa) { + private void addPropertiesListenerToAttributeItself(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributePropertyChangeListener> lsnrRef = attributeToPropListener.get(jpa); AttributePropertyChangeListener lsnr = null; if (lsnrRef != null) lsnr = lsnrRef.get(); if (lsnr == null) { lsnr = new AttributePropertyChangeListener(); - jpa.addPropertyChangeListener(ModifiablePersistentAttribute.MAPPING_PROPERTY, lsnr); + jpa.addPropertyChangeListener(SpecifiedPersistentAttribute.MAPPING_PROPERTY, lsnr); lsnrRef = new WeakReference<AttributePropertyChangeListener>(lsnr); attributeToPropListener.put(jpa, lsnrRef); } } - private void addOptPropListenerToAttributeMapping(JavaModifiablePersistentAttribute jpa) { + private void addOptPropListenerToAttributeMapping(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeMappingOptionalityChangeListener> lsnrRef = attributeMappingOptionalityToPropListener.get(jpa); AttributeMappingOptionalityChangeListener lsnr = null; if (lsnrRef != null) @@ -642,7 +642,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - private void addPropertiesListenerToJoiningStrategy(JavaModifiablePersistentAttribute jpa) { + private void addPropertiesListenerToJoiningStrategy(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeJoiningStrategyPropertyChangeListener> lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); AttributeJoiningStrategyPropertyChangeListener lsnr = null; @@ -667,7 +667,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - private void addPropertiesListenerToRelationshipReference(JavaModifiablePersistentAttribute jpa) { + private void addPropertiesListenerToRelationshipReference(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeRelationshipReferencePropertyChangeListener> lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); AttributeRelationshipReferencePropertyChangeListener lsnr = null; @@ -711,7 +711,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { removeStateListenerFromEntity(jpt); } - private void removeListenersFromAttribute(JavaModifiablePersistentAttribute jpa) { + private void removeListenersFromAttribute(JavaSpecifiedPersistentAttribute jpa) { removePropListenerFromAttribute(jpa); } @@ -741,14 +741,14 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } } - private void removePropListenerFromAttribute(JavaModifiablePersistentAttribute jpa) { + private void removePropListenerFromAttribute(JavaSpecifiedPersistentAttribute jpa) { removePropListenerFromAttributeItself(jpa); removePropListenerFromJoiningStrategy(jpa); removePropListenerFromRelationshipReference(jpa); removeOptPropListenerFromAttributeMapping(jpa); } - private void removePropListenerFromAttributeItself(JavaModifiablePersistentAttribute jpa) { + private void removePropListenerFromAttributeItself(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributePropertyChangeListener> lsnrRef = attributeToPropListener.get(jpa); PropertyChangeListener lsnr = null; if (lsnrRef != null) @@ -756,14 +756,14 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { if (lsnr != null) { attributeToPropListener.remove(jpa); try { - jpa.removePropertyChangeListener(ModifiablePersistentAttribute.MAPPING_PROPERTY, lsnr); + jpa.removePropertyChangeListener(SpecifiedPersistentAttribute.MAPPING_PROPERTY, lsnr); } catch (IllegalArgumentException e) { //$NON-NLS-1$ } } } - private void removePropListenerFromJoiningStrategy(JavaModifiablePersistentAttribute jpa) { + private void removePropListenerFromJoiningStrategy(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeJoiningStrategyPropertyChangeListener> lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeJoiningStrategyToPropListener.get(jpa); @@ -789,7 +789,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - private void removeOptPropListenerFromAttributeMapping(JavaModifiablePersistentAttribute jpa) { + private void removeOptPropListenerFromAttributeMapping(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeMappingOptionalityChangeListener> lsnrRef = attributeMappingOptionalityToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeMappingOptionalityToPropListener.get(jpa); @@ -809,7 +809,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } - private void removePropListenerFromRelationshipReference(JavaModifiablePersistentAttribute jpa) { + private void removePropListenerFromRelationshipReference(JavaSpecifiedPersistentAttribute jpa) { WeakReference<AttributeRelationshipReferencePropertyChangeListener> lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); PropertyChangeListener lsnr = null; lsnrRef = attributeRelationshipReferenceToPropListener.get(jpa); @@ -879,18 +879,18 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } private void removeAttributePropChangeListeners() { - Iterator<JavaModifiablePersistentAttribute> it = attributeToPropListener.keySet().iterator(); - Set<JavaModifiablePersistentAttribute> s = new HashSet<JavaModifiablePersistentAttribute>(); + Iterator<JavaSpecifiedPersistentAttribute> it = attributeToPropListener.keySet().iterator(); + Set<JavaSpecifiedPersistentAttribute> s = new HashSet<JavaSpecifiedPersistentAttribute>(); while(it.hasNext()) s.add(it.next()); it = s.iterator(); while(it.hasNext()) { - JavaModifiablePersistentAttribute jpa = it.next(); + JavaSpecifiedPersistentAttribute jpa = it.next(); WeakReference<AttributePropertyChangeListener> ref = attributeToPropListener.remove(jpa); PropertyChangeListener lsn = ref.get(); if (lsn != null) try { - jpa.removePropertyChangeListener(ModifiablePersistentAttribute.MAPPING_PROPERTY, lsn); + jpa.removePropertyChangeListener(SpecifiedPersistentAttribute.MAPPING_PROPERTY, lsn); } catch (IllegalArgumentException e) { //$NON-NLS-1$ } @@ -900,13 +900,13 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } private void removeAttributeJoiningStrategyPropChangeListeners() { - Iterator<JavaModifiablePersistentAttribute> it = attributeJoiningStrategyToPropListener.keySet().iterator(); - Set<JavaModifiablePersistentAttribute> s = new HashSet<JavaModifiablePersistentAttribute>(); + Iterator<JavaSpecifiedPersistentAttribute> it = attributeJoiningStrategyToPropListener.keySet().iterator(); + Set<JavaSpecifiedPersistentAttribute> s = new HashSet<JavaSpecifiedPersistentAttribute>(); while(it.hasNext()) s.add(it.next()); it = s.iterator(); while(it.hasNext()) { - JavaModifiablePersistentAttribute jpa = it.next(); + JavaSpecifiedPersistentAttribute jpa = it.next(); WeakReference<AttributeJoiningStrategyPropertyChangeListener> ref = attributeJoiningStrategyToPropListener.remove(jpa); PropertyChangeListener lsn = ref.get(); if (lsn != null) @@ -921,13 +921,13 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { } private void removeOptPropListeners() { - Iterator<JavaModifiablePersistentAttribute> it = this.attributeMappingOptionalityToPropListener.keySet().iterator(); - Set<JavaModifiablePersistentAttribute> s = new HashSet<JavaModifiablePersistentAttribute>(); + Iterator<JavaSpecifiedPersistentAttribute> it = this.attributeMappingOptionalityToPropListener.keySet().iterator(); + Set<JavaSpecifiedPersistentAttribute> s = new HashSet<JavaSpecifiedPersistentAttribute>(); while(it.hasNext()) s.add(it.next()); it = s.iterator(); while(it.hasNext()) { - JavaModifiablePersistentAttribute jpa = it.next(); + JavaSpecifiedPersistentAttribute jpa = it.next(); WeakReference<AttributeMappingOptionalityChangeListener> ref = attributeMappingOptionalityToPropListener.remove(jpa); if (ref == null) continue; @@ -1184,10 +1184,10 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { synchronized public void propertyChanged(PropertyChangeEvent event) { Model source = event.getSource(); - if (!JavaModifiablePersistentAttribute.class.isInstance(source)) + if (!JavaSpecifiedPersistentAttribute.class.isInstance(source)) return; PictogramElement pe = featureProvider - .getPictogramElementForBusinessObject(((JavaModifiablePersistentAttribute) source) + .getPictogramElementForBusinessObject(((JavaSpecifiedPersistentAttribute) source) .getParent()); final GraphicalRemoveAttributeFeature remove = new GraphicalRemoveAttributeFeature(featureProvider); final CustomContext ctx = new CustomContext(); @@ -1199,8 +1199,8 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { }; Display.getDefault().asyncExec(runnable); String propName = event.getPropertyName(); - if (propName.equals(ModifiablePersistentAttribute.MAPPING_PROPERTY)) { - renewAttributeMappingPropListener((JavaModifiablePersistentAttribute) source); + if (propName.equals(SpecifiedPersistentAttribute.MAPPING_PROPERTY)) { + renewAttributeMappingPropListener((JavaSpecifiedPersistentAttribute) source); } } } @@ -1223,9 +1223,9 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { if (nd == null) return; nd = nd.getParent(); - if ((nd == null) || !JavaModifiablePersistentAttribute.class.isInstance(nd)) + if ((nd == null) || !JavaSpecifiedPersistentAttribute.class.isInstance(nd)) return; - JavaModifiablePersistentAttribute at = (JavaModifiablePersistentAttribute)nd; + JavaSpecifiedPersistentAttribute at = (JavaSpecifiedPersistentAttribute)nd; if (!at.getParent().getParent().getResource().exists()) return; PictogramElement pe = featureProvider.getPictogramElementForBusinessObject(at.getParent()); @@ -1256,9 +1256,9 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { p = p.getParent(); if (p == null) return; - if (!JavaModifiablePersistentAttribute.class.isInstance(p)) + if (!JavaSpecifiedPersistentAttribute.class.isInstance(p)) return; - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute)p; + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute)p; renewAttributeJoiningStrategyPropertyListener(jpa); if (!jpa.getParent().getParent().getResource().exists()) return; @@ -1287,7 +1287,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { Boolean optional = (Boolean)event.getNewValue(); boolean isOptional = (optional == null) ? true : optional.booleanValue(); OptionalMapping nm = (OptionalMapping)event.getSource(); - JavaModifiablePersistentAttribute jpa = (JavaModifiablePersistentAttribute)nm.getParent(); + JavaSpecifiedPersistentAttribute jpa = (JavaSpecifiedPersistentAttribute)nm.getParent(); IRelation rel = featureProvider.getRelationRelatedToAttribute(jpa); boolean atBeginning = !rel.getOwner().equals(jpa.getParent()) || !rel.getOwnerAttributeName().equals(jpa.getName()); @@ -1331,10 +1331,10 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { @SuppressWarnings("unchecked") synchronized public void run() { try { - Iterator<JavaModifiablePersistentAttribute> it = (Iterator<JavaModifiablePersistentAttribute>) event.getItems().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> it = (Iterator<JavaSpecifiedPersistentAttribute>) event.getItems().iterator(); Set<Shape> shapesToRemove = new HashSet<Shape>(); while (it.hasNext()) { - JavaModifiablePersistentAttribute at = it.next(); + JavaSpecifiedPersistentAttribute at = it.next(); /* String key = getKeyForBusinessObject(at); remove(key); @@ -1347,7 +1347,7 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { JavaPersistentType jpt = (JavaPersistentType)event.getSource(); - JavaModifiablePersistentAttribute newAt = jpt.getAttributeNamed(at.getName()); + JavaSpecifiedPersistentAttribute newAt = jpt.getAttributeNamed(at.getName()); if (newAt != null) { RemoveAttributeFeature ft = new RemoveAttributeFeature(featureProvider, true, true); RemoveContext c = new RemoveContext(atShape); @@ -1410,9 +1410,9 @@ public class JPASolver implements IResourceChangeListener, IJpaSolver { ContainerShape entShape = (ContainerShape)featureProvider.getPictogramElementForBusinessObject(jpt); // remove invalidated relations (if any) - Iterator<JavaModifiablePersistentAttribute> it = (Iterator<JavaModifiablePersistentAttribute>) event.getItems().iterator(); + Iterator<JavaSpecifiedPersistentAttribute> it = (Iterator<JavaSpecifiedPersistentAttribute>) event.getItems().iterator(); while (it.hasNext()) { - JavaModifiablePersistentAttribute at = it.next(); + JavaSpecifiedPersistentAttribute at = it.next(); if(at.getMapping() == null || at.getMapping().getMappingAnnotation() == null){ at.getResourceAttribute().getJavaResourceCompilationUnit().synchronizeWithJavaSource(); } diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java index 9dc362df1f..0f3ec9add2 100644 --- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java +++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/util/JpaArtifactFactory.java @@ -73,7 +73,7 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; @@ -177,51 +177,51 @@ public class JpaArtifactFactory { } public void addOneToOneUnidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt, - JavaModifiablePersistentAttribute attribute) { + JavaSpecifiedPersistentAttribute attribute) { addOneToOneRelation(fp, jpt, attribute, null, null, JPAEditorConstants.RELATION_TYPE_UNIDIRECTIONAL); } public void addOneToOneBidirectionalRelation (IFeatureProvider fp, JavaPersistentType jpt1, - JavaModifiablePersistentAttribute attribute1, JavaPersistentType jpt2, - JavaModifiablePersistentAttribute attribute2) { + JavaSpecifiedPersistentAttribute attribute1, JavaPersistentType jpt2, + JavaSpecifiedPersistentAttribute attribute2) { addOneToOneRelation(fp, jpt1, attribute1, jpt2, attribute2, JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL); } public void addOneToManyUnidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt, - JavaModifiablePersistentAttribute attribute, boolean isMap) { + JavaSpecifiedPersistentAttribute attribute, boolean isMap) { addOneToManyRelation(fp, jpt, attribute, null, null, JPAEditorConstants.RELATION_TYPE_UNIDIRECTIONAL, isMap); } public void addOneToManyBidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt1, - JavaModifiablePersistentAttribute attribute1, JavaPersistentType jpt2, - JavaModifiablePersistentAttribute attribute2, boolean isMap) { + JavaSpecifiedPersistentAttribute attribute1, JavaPersistentType jpt2, + JavaSpecifiedPersistentAttribute attribute2, boolean isMap) { addOneToManyRelation(fp, jpt1, attribute1, jpt2, attribute2, JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL, isMap); } public void addManyToOneBidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt1, - JavaModifiablePersistentAttribute attribute1, JavaPersistentType jpt2, - JavaModifiablePersistentAttribute attribute2, boolean isMap) { + JavaSpecifiedPersistentAttribute attribute1, JavaPersistentType jpt2, + JavaSpecifiedPersistentAttribute attribute2, boolean isMap) { addManyToOneRelation(fp, jpt1, attribute1, jpt2, attribute2, JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL, isMap); } public void addOneToOneRelation(IFeatureProvider fp, - JavaPersistentType ownerJPT, JavaModifiablePersistentAttribute ownerAttibute, + JavaPersistentType ownerJPT, JavaSpecifiedPersistentAttribute ownerAttibute, JavaPersistentType referencedJPT, - JavaModifiablePersistentAttribute referencedAttribute, int direction) { + JavaSpecifiedPersistentAttribute referencedAttribute, int direction) { setMappingKeyToAttribute(fp, ownerJPT, ownerAttibute, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); if (direction == JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL) { - JavaModifiablePersistentAttribute resolvedAttribute = setMappingKeyToAttribute(fp, referencedJPT, referencedAttribute, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + JavaSpecifiedPersistentAttribute resolvedAttribute = setMappingKeyToAttribute(fp, referencedJPT, referencedAttribute, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); String mappedByAttr = getMappeByAttribute(fp, ownerJPT, ownerAttibute); setMappedByAnnotationAttribute(resolvedAttribute, referencedJPT, mappedByAttr); } @@ -229,15 +229,15 @@ public class JpaArtifactFactory { } public void addManyToOneRelation(IFeatureProvider fp, JavaPersistentType manySideJPT, - JavaModifiablePersistentAttribute manySideAttribute, JavaPersistentType singleSideJPT, - JavaModifiablePersistentAttribute singleSideAttibute, int direction, boolean isMap) { + JavaSpecifiedPersistentAttribute manySideAttribute, JavaPersistentType singleSideJPT, + JavaSpecifiedPersistentAttribute singleSideAttibute, int direction, boolean isMap) { setMappingKeyToAttribute(fp, manySideJPT, manySideAttribute, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); if (direction == JPAEditorConstants.RELATION_TYPE_UNIDIRECTIONAL) return; - JavaModifiablePersistentAttribute resolvedSingleSideAttribute = setMappingKeyToAttribute(fp, singleSideJPT, singleSideAttibute, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + JavaSpecifiedPersistentAttribute resolvedSingleSideAttribute = setMappingKeyToAttribute(fp, singleSideJPT, singleSideAttibute, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); String mappedByAttr = getMappeByAttribute(fp, manySideJPT, manySideAttribute); setMappedByAnnotationAttribute(resolvedSingleSideAttribute, singleSideJPT, mappedByAttr); if (isMap) { @@ -247,11 +247,11 @@ public class JpaArtifactFactory { } public void addOneToManyRelation(IFeatureProvider fp, JavaPersistentType singleSideJPT, - JavaModifiablePersistentAttribute singleSideAttibute, + JavaSpecifiedPersistentAttribute singleSideAttibute, JavaPersistentType manySideJPT, - JavaModifiablePersistentAttribute manySideAttribute, int direction, boolean isMap) { + JavaSpecifiedPersistentAttribute manySideAttribute, int direction, boolean isMap) { - JavaModifiablePersistentAttribute resolvedSingleSideAttribute = setMappingKeyToAttribute(fp, singleSideJPT, singleSideAttibute, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + JavaSpecifiedPersistentAttribute resolvedSingleSideAttribute = setMappingKeyToAttribute(fp, singleSideJPT, singleSideAttibute, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); if (direction == JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL) { setMappingKeyToAttribute(fp, manySideJPT, manySideAttribute, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); @@ -265,21 +265,21 @@ public class JpaArtifactFactory { } private String getMappeByAttribute(IFeatureProvider fp, - JavaPersistentType ownerSideJPT, JavaModifiablePersistentAttribute ownerSideAttribute) { + JavaPersistentType ownerSideJPT, JavaSpecifiedPersistentAttribute ownerSideAttribute) { String mappedByAttr = ownerSideAttribute.getName(); if(hasEmbeddableAnnotation(ownerSideJPT)){ HasReferanceRelation ref = JpaArtifactFactory.INSTANCE.findFisrtHasReferenceRelationByEmbeddable(ownerSideJPT, (IJPAEditorFeatureProvider)fp); if(ref != null){ - JavaModifiablePersistentAttribute embeddingAttribute = ref.getEmbeddedAnnotatedAttribute(); + JavaSpecifiedPersistentAttribute embeddingAttribute = ref.getEmbeddedAnnotatedAttribute(); mappedByAttr = embeddingAttribute.getName() + "." + ownerSideAttribute.getName(); //$NON-NLS-1$ } } return mappedByAttr; } - private void setMappedByAnnotationAttribute(JavaModifiablePersistentAttribute resolvedAttr, JavaPersistentType type1, String jpaName){ + private void setMappedByAnnotationAttribute(JavaSpecifiedPersistentAttribute resolvedAttr, JavaPersistentType type1, String jpaName){ JavaAttributeMapping mapping = resolvedAttr.getMapping(); if (!(mapping instanceof RelationshipMapping)) { @@ -295,20 +295,20 @@ public class JpaArtifactFactory { ((OwnableRelationshipMappingAnnotation)annotation).setMappedBy(jpaName); } - private JavaModifiablePersistentAttribute setMappingKeyToAttribute(IFeatureProvider fp, JavaPersistentType jpt, JavaModifiablePersistentAttribute jpa, String mappingKey){ - JavaModifiablePersistentAttribute resolvedManySideAttribute = (JavaModifiablePersistentAttribute) jpt.resolveAttribute(jpa.getName()); + private JavaSpecifiedPersistentAttribute setMappingKeyToAttribute(IFeatureProvider fp, JavaPersistentType jpt, JavaSpecifiedPersistentAttribute jpa, String mappingKey){ + JavaSpecifiedPersistentAttribute resolvedManySideAttribute = (JavaSpecifiedPersistentAttribute) jpt.resolveAttribute(jpa.getName()); resolvedManySideAttribute.setMappingKey(mappingKey); return resolvedManySideAttribute; } - private void addJoinColumnIfNecessary(JavaModifiablePersistentAttribute jpa, + private void addJoinColumnIfNecessary(JavaSpecifiedPersistentAttribute jpa, JavaPersistentType jpt) { if (JPAEditorUtil.checkJPAFacetVersion(jpa.getJpaProject(), JPAEditorUtil.JPA_PROJECT_FACET_10) || JPADiagramPropertyPage.shouldOneToManyUnidirBeOldStyle(jpa .getJpaProject().getProject())) return; - JavaModifiablePersistentAttribute[] ids = getIds(jpt); + JavaSpecifiedPersistentAttribute[] ids = getIds(jpt); if (ids.length == 0) return; final String tableName = getTableName(jpt); @@ -327,7 +327,7 @@ public class JpaArtifactFactory { Embeddable emb = pu.getEmbeddable(embeddableTypeName); for (AttributeMapping am : emb.getAllAttributeMappings()) { JoinColumnAnnotation jc = (JoinColumnAnnotation) jpa.getResourceAttribute().addAnnotation(jpa.getResourceAttribute().getAnnotationsSize(JoinColumnAnnotation.ANNOTATION_NAME), JoinColumnAnnotation.ANNOTATION_NAME); - JavaModifiablePersistentAttribute at = (JavaModifiablePersistentAttribute) am + JavaSpecifiedPersistentAttribute at = (JavaSpecifiedPersistentAttribute) am .getPersistentAttribute(); String idColName = atNameToColName.get(at.getName()); idColName = (idColName != null) ? idColName @@ -337,7 +337,7 @@ public class JpaArtifactFactory { } } } else { - for (JavaModifiablePersistentAttribute idAt : ids) { + for (JavaSpecifiedPersistentAttribute idAt : ids) { JoinColumnAnnotation jc = (JoinColumnAnnotation) jpa.getResourceAttribute().addAnnotation( jpa.getResourceAttribute().getAnnotationsSize(JoinColumnAnnotation.ANNOTATION_NAME), JoinColumnAnnotation.ANNOTATION_NAME); String idColName = getColumnName(idAt); jc.setName(tableName + "_" + idColName); //$NON-NLS-1$ @@ -347,7 +347,7 @@ public class JpaArtifactFactory { } private Hashtable<String, String> getOverriddenColNames( - JavaModifiablePersistentAttribute embIdAt) { + JavaSpecifiedPersistentAttribute embIdAt) { Hashtable<String, String> res = new Hashtable<String, String>(); if(embIdAt.getResourceAttribute().getAnnotationsSize(AttributeOverrideAnnotation.ANNOTATION_NAME) > 0){ AttributeOverrideAnnotation aon = (AttributeOverrideAnnotation) embIdAt @@ -380,7 +380,7 @@ public class JpaArtifactFactory { public void addManyToOneUnidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt, - JavaModifiablePersistentAttribute attribute) { + JavaSpecifiedPersistentAttribute attribute) { addManyToOneRelation(fp, jpt, attribute, null, null, JPAEditorConstants.RELATION_TYPE_UNIDIRECTIONAL, false); @@ -388,31 +388,31 @@ public class JpaArtifactFactory { public void addManyToManyBidirectionalRelation(IFeatureProvider fp, JavaPersistentType jpt1, - JavaModifiablePersistentAttribute attribute1, JavaPersistentType jpt2, - JavaModifiablePersistentAttribute attribute2, boolean isMap) { + JavaSpecifiedPersistentAttribute attribute1, JavaPersistentType jpt2, + JavaSpecifiedPersistentAttribute attribute2, boolean isMap) { addManyToManyRelation(fp, jpt1, attribute1, jpt2, attribute2, JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL, isMap); } public void addManyToManyUnidirectionalRelation(IFeatureProvider fp, JavaPersistentType annotatedJPT, - JavaModifiablePersistentAttribute annotatedAttribute, boolean isMap) { + JavaSpecifiedPersistentAttribute annotatedAttribute, boolean isMap) { addManyToManyRelation(fp, annotatedJPT, annotatedAttribute, null, null, JPAEditorConstants.RELATION_TYPE_UNIDIRECTIONAL, isMap); } public void addManyToManyRelation(IFeatureProvider fp, JavaPersistentType ownerSideJPT, - JavaModifiablePersistentAttribute ownerSideAttribute, + JavaSpecifiedPersistentAttribute ownerSideAttribute, JavaPersistentType inverseSideJPT, - JavaModifiablePersistentAttribute inverseSideAttibute, int direction, boolean isMap) { + JavaSpecifiedPersistentAttribute inverseSideAttibute, int direction, boolean isMap) { - JavaModifiablePersistentAttribute resolvedOwnerSideAttribute = setMappingKeyToAttribute(fp, ownerSideJPT, ownerSideAttribute, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + JavaSpecifiedPersistentAttribute resolvedOwnerSideAttribute = setMappingKeyToAttribute(fp, ownerSideJPT, ownerSideAttribute, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); if (isMap) resolvedOwnerSideAttribute.getResourceAttribute().addAnnotation(MapKeyAnnotation.ANNOTATION_NAME); if (direction == JPAEditorConstants.RELATION_TYPE_BIDIRECTIONAL) { - JavaModifiablePersistentAttribute resolvedInverseSideAttribute = setMappingKeyToAttribute(fp, inverseSideJPT, inverseSideAttibute, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + JavaSpecifiedPersistentAttribute resolvedInverseSideAttribute = setMappingKeyToAttribute(fp, inverseSideJPT, inverseSideAttibute, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); String mappedByAttr = getMappeByAttribute(fp, ownerSideJPT, ownerSideAttribute); setMappedByAnnotationAttribute(resolvedInverseSideAttribute, inverseSideJPT, mappedByAttr); @@ -612,7 +612,7 @@ public class JpaArtifactFactory { PersistenceUnit pu = lit.next(); for(PersistentType jpt : pu.getPersistentTypes()){ if(!jpt.equals(embeddable)){ - for(JavaModifiablePersistentAttribute jpa : ((JavaPersistentType)jpt).getAttributes()){ + for(JavaSpecifiedPersistentAttribute jpa : ((JavaPersistentType)jpt).getAttributes()){ if(isEmbeddedId(jpa) && JPAEditorUtil.getAttributeTypeNameWithGenerics(jpa).equals(embeddable.getName())){ embeddingEntities.add((JavaPersistentType) jpt); } @@ -664,19 +664,19 @@ public class JpaArtifactFactory { * @param cu - the {@link ICompilationUnit} of the referencing {@link JavaPersistentType} * @return the newly created relationship attribute. */ - public JavaModifiablePersistentAttribute addAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType jpt, + public JavaSpecifiedPersistentAttribute addAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType jpt, JavaPersistentType attributeType, String mapKeyType, String attributeName, String actName, boolean isCollection, ICompilationUnit cu) { try { if (doesAttributeExist(jpt, actName)) { - return (JavaModifiablePersistentAttribute) jpt.resolveAttribute(attributeName); + return (JavaSpecifiedPersistentAttribute) jpt.resolveAttribute(attributeName); } } catch (JavaModelException e) { JPADiagramEditorPlugin.logError("Cannnot create a new attribute with name " + attributeName, e); //$NON-NLS-1$ } - JavaModifiablePersistentAttribute res = makeNewAttribute(fp, jpt, cu, attributeName, attributeType.getName(), actName, mapKeyType, null, null, isCollection); + JavaSpecifiedPersistentAttribute res = makeNewAttribute(fp, jpt, cu, attributeName, attributeType.getName(), actName, mapKeyType, null, null, isCollection); return res; } @@ -762,7 +762,7 @@ public class JpaArtifactFactory { return newAttrName; } - public JavaModifiablePersistentAttribute makeNewAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType jpt, ICompilationUnit cu, String attrName, String attrTypeName, + public JavaSpecifiedPersistentAttribute makeNewAttribute(IJPAEditorFeatureProvider fp, JavaPersistentType jpt, ICompilationUnit cu, String attrName, String attrTypeName, String actName, String mapKeyType, String[] attrTypes, List<String> annotations, boolean isCollection) { if(cu == null){ @@ -776,7 +776,7 @@ public class JpaArtifactFactory { JPADiagramEditorPlugin.logError("Cannot create a new attribute with name " + attrName, e); //$NON-NLS-1$ } - JavaModifiablePersistentAttribute jpa = jpt.getAttributeNamed(attrName); + JavaSpecifiedPersistentAttribute jpa = jpt.getAttributeNamed(attrName); if(jpa == null){ jpa = jpt.getAttributeNamed(actName); } @@ -854,7 +854,7 @@ public class JpaArtifactFactory { * @param persistentAttribite * @return an array of all current annotations of the given attribute. */ - public Annotation[] getAnnotations(JavaModifiablePersistentAttribute persistentAttribite) { + public Annotation[] getAnnotations(JavaSpecifiedPersistentAttribute persistentAttribite) { JavaResourceAttribute jrpt = persistentAttribite.getResourceAttribute(); Annotation[] res = new Annotation[jrpt.getAnnotationsSize()]; int c = 0; @@ -870,7 +870,7 @@ public class JpaArtifactFactory { * @param persistentAttribite * @return a set of strings of all current annotation names of the given attribute. */ - public HashSet<String> getAnnotationNames(JavaModifiablePersistentAttribute persistentAttribite) { + public HashSet<String> getAnnotationNames(JavaSpecifiedPersistentAttribute persistentAttribite) { HashSet<String> res = new HashSet<String>(); if(persistentAttribite != null) { JavaResourceAttribute jrpt = persistentAttribite.getResourceAttribute(); @@ -887,7 +887,7 @@ public class JpaArtifactFactory { * @return a list of strings of all current annotation names of the given attribute. */ public List<String> getAnnotationStrings( - JavaModifiablePersistentAttribute persistentAttribite) { + JavaSpecifiedPersistentAttribute persistentAttribite) { JavaPersistentType jpt = (JavaPersistentType)persistentAttribite.getParent(); CompilationUnit jdtCU = jpt.getJavaResourceType().getJavaResourceCompilationUnit().buildASTRoot(); @@ -905,7 +905,7 @@ public class JpaArtifactFactory { * @param at * @return true, if the attribute is owner of the relationship, false otherwise. */ - private boolean isNonOwner(JavaModifiablePersistentAttribute at) { + private boolean isNonOwner(JavaSpecifiedPersistentAttribute at) { JavaAttributeMapping jam = at.getMapping(); if (!(jam.getMappingAnnotation() instanceof OwnableRelationshipMappingAnnotation)) return false; @@ -988,7 +988,7 @@ public class JpaArtifactFactory { Collection<HasReferanceRelation> resSet = new HashSet<HasReferanceRelation>(); HasReferanceRelation res = null; - for (JavaModifiablePersistentAttribute embeddingAttribute : embeddingEntity.getAttributes()) { + for (JavaSpecifiedPersistentAttribute embeddingAttribute : embeddingEntity.getAttributes()) { IResource r = embeddingAttribute.getParent().getResource(); if (!r.exists()) throw new RuntimeException(); @@ -1030,7 +1030,7 @@ public class JpaArtifactFactory { * @param fp * @return the newly created relationship. */ - public IRelation produceIRelation(JavaModifiablePersistentAttribute persistentAttribite, JavaPersistentType jpt2, + public IRelation produceIRelation(JavaSpecifiedPersistentAttribute persistentAttribite, JavaPersistentType jpt2, IJPAEditorFeatureProvider fp) { IRelation res = null; @@ -1062,7 +1062,7 @@ public class JpaArtifactFactory { * @param an - attribute's relationship annotation * @return the parent {@link JavaPersistentType} of an attribute. */ - public JavaPersistentType findJPT(JavaModifiablePersistentAttribute persistentAttribite, IJPAEditorFeatureProvider fp, Annotation an) { + public JavaPersistentType findJPT(JavaSpecifiedPersistentAttribute persistentAttribite, IJPAEditorFeatureProvider fp, Annotation an) { JavaResourceAttribute jrpa = persistentAttribite.getResourceAttribute(); String relTypeName = getRelTypeName(an, jrpa); JavaPersistentType relJPT = (JavaPersistentType)fp.getBusinessObjectForKey(relTypeName); @@ -1073,7 +1073,7 @@ public class JpaArtifactFactory { JavaPersistentType newJPT, JavaPersistentType jpt2, IJPAEditorFeatureProvider fp) { Set<IRelation> res = new HashSet<IRelation>(); - for (JavaModifiablePersistentAttribute at : newJPT.getAttributes()) { + for (JavaSpecifiedPersistentAttribute at : newJPT.getAttributes()) { IRelation rel = produceIRelation(at, jpt2, fp); if (rel != null) res.add(rel); @@ -1109,8 +1109,8 @@ public class JpaArtifactFactory { * @param jpt * @return a set of all attributes of an entity involved in relationship with the given entity. */ - public Set<JavaModifiablePersistentAttribute> getRelatedAttributes(JavaPersistentType jpt) { - Set<JavaModifiablePersistentAttribute> res = new HashSet<JavaModifiablePersistentAttribute>(); + public Set<JavaSpecifiedPersistentAttribute> getRelatedAttributes(JavaPersistentType jpt) { + Set<JavaSpecifiedPersistentAttribute> res = new HashSet<JavaSpecifiedPersistentAttribute>(); Iterator<JpaFile> it = jpt.getJpaProject().getJpaFiles().iterator(); PersistenceUnit pu = JpaArtifactFactory.INSTANCE.getPersistenceUnit(jpt.getJpaProject()); while (it.hasNext()) { @@ -1130,7 +1130,7 @@ public class JpaArtifactFactory { .getPersistentType(name); if (jpt1 == null) continue; - Set<JavaModifiablePersistentAttribute> relAts = getRelAttributes(jpt, jpt1); + Set<JavaSpecifiedPersistentAttribute> relAts = getRelAttributes(jpt, jpt1); if (relAts != null) res.addAll(relAts); } @@ -1143,11 +1143,11 @@ public class JpaArtifactFactory { * @param relJPT * @return the attribute belonging to jpt and involved in a relationship with relJPT. */ - private Set<JavaModifiablePersistentAttribute> getRelAttributes(JavaPersistentType jpt, + private Set<JavaSpecifiedPersistentAttribute> getRelAttributes(JavaPersistentType jpt, JavaPersistentType relJPT) { - Set<JavaModifiablePersistentAttribute> res = new HashSet<JavaModifiablePersistentAttribute>(); - for (JavaModifiablePersistentAttribute at : relJPT.getAttributes()) { + Set<JavaSpecifiedPersistentAttribute> res = new HashSet<JavaSpecifiedPersistentAttribute>(); + for (JavaSpecifiedPersistentAttribute at : relJPT.getAttributes()) { IResource r = at.getParent().getResource(); if (!r.exists()) throw new RuntimeException(); @@ -1178,7 +1178,7 @@ public class JpaArtifactFactory { } } - public JavaModifiablePersistentAttribute renameAttribute(JavaPersistentType jpt, + public JavaSpecifiedPersistentAttribute renameAttribute(JavaPersistentType jpt, String oldName, String newName, String inverseEntityName, IJPAEditorFeatureProvider fp) throws InterruptedException { newName = JPAEditorUtil.decapitalizeFirstLetter(newName); @@ -1187,7 +1187,7 @@ public class JpaArtifactFactory { } newName = JPAEditorUtil.produceUniqueAttributeName(jpt, newName); PersistenceUnit pu = null; - JavaModifiablePersistentAttribute oldAt = jpt.getAttributeNamed(oldName); + JavaSpecifiedPersistentAttribute oldAt = jpt.getAttributeNamed(oldName); fp.addAddIgnore((JavaPersistentType)oldAt.getParent(), newName); JavaResourceAttribute jra = oldAt .getResourceAttribute(); @@ -1196,7 +1196,7 @@ public class JpaArtifactFactory { Command renameAttributeCommand = new RenameAttributeCommand(null, jpt, oldName, newName, fp); getJpaProjectManager().execute(renameAttributeCommand, SynchronousUiCommandExecutor.instance()); - JavaModifiablePersistentAttribute newAt = jpt.getAttributeNamed(newName); + JavaSpecifiedPersistentAttribute newAt = jpt.getAttributeNamed(newName); if (newAt == null) { JPADiagramEditorPlugin.logError("The attribute " + newName + " could not be resolved", new NullPointerException()); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -1216,8 +1216,8 @@ public class JpaArtifactFactory { private void updateIRelationshipAttributes(JavaPersistentType jpt, String inverseEntityName, IJPAEditorFeatureProvider fp, - PersistenceUnit pu, JavaModifiablePersistentAttribute oldAt, - JavaModifiablePersistentAttribute newAt) throws InterruptedException { + PersistenceUnit pu, JavaSpecifiedPersistentAttribute oldAt, + JavaSpecifiedPersistentAttribute newAt) throws InterruptedException { IRelation rel = fp.getRelationRelatedToAttribute(oldAt); String inverseAttributeName = null; JavaPersistentType inverseJPT = null; @@ -1253,11 +1253,11 @@ public class JpaArtifactFactory { } - private void renameMapsIdAnnotationValue(JavaModifiablePersistentAttribute oldAt, - JavaModifiablePersistentAttribute newAt, HashSet<JavaPersistentType> embeddingEntities) { + private void renameMapsIdAnnotationValue(JavaSpecifiedPersistentAttribute oldAt, + JavaSpecifiedPersistentAttribute newAt, HashSet<JavaPersistentType> embeddingEntities) { for(JavaPersistentType embeddingEntity : embeddingEntities){ - for(JavaModifiablePersistentAttribute attr : embeddingEntity.getAttributes()){ + for(JavaSpecifiedPersistentAttribute attr : embeddingEntity.getAttributes()){ Annotation ann = attr.getResourceAttribute().getAnnotation(MapsId2_0Annotation.ANNOTATION_NAME); if(ann != null){ MapsId2_0Annotation mapsIdAnn = (MapsId2_0Annotation) ann; @@ -1294,16 +1294,16 @@ public class JpaArtifactFactory { * @param fp * @return the newly created {@link IRelation} */ - private IRelation produceRelation(JavaModifiablePersistentAttribute persistentAttribite, Annotation an, + private IRelation produceRelation(JavaSpecifiedPersistentAttribute persistentAttribite, Annotation an, JavaPersistentType relJPT, IJPAEditorFeatureProvider fp) { - Hashtable<JavaModifiablePersistentAttribute, Annotation> ht = getRelAttributeAnnotation( + Hashtable<JavaSpecifiedPersistentAttribute, Annotation> ht = getRelAttributeAnnotation( persistentAttribite, relJPT, fp); if (ht == null) { return produceUniDirRelation((JavaPersistentType)persistentAttribite .getParent(), persistentAttribite, an, relJPT, fp); } else { - JavaModifiablePersistentAttribute relAt = ht.keys().nextElement(); + JavaSpecifiedPersistentAttribute relAt = ht.keys().nextElement(); Annotation relAn = ht.get(relAt); return produceBiDirRelation((JavaPersistentType)persistentAttribite .getParent(), persistentAttribite, an, relJPT, @@ -1320,7 +1320,7 @@ public class JpaArtifactFactory { * @param fp * @return the newly created {@link HasReferanceRelation}. */ - private HasReferanceRelation produceEmbeddedRelation(JavaModifiablePersistentAttribute embeddingAttribute, Annotation an, + private HasReferanceRelation produceEmbeddedRelation(JavaSpecifiedPersistentAttribute embeddingAttribute, Annotation an, JavaPersistentType embeddable, IJPAEditorFeatureProvider fp) { if (!JPAEditorUtil.getCompilationUnit((JavaPersistentType) embeddingAttribute.getParent()).exists()) @@ -1353,11 +1353,11 @@ public class JpaArtifactFactory { * @param fp * @return a {@link Hashtable} containing the pair: inverseAttribute <-> relation annotation. */ - private Hashtable<JavaModifiablePersistentAttribute, Annotation> getRelAttributeAnnotation( - JavaModifiablePersistentAttribute jpa, JavaPersistentType relJPT, IJPAEditorFeatureProvider fp) { + private Hashtable<JavaSpecifiedPersistentAttribute, Annotation> getRelAttributeAnnotation( + JavaSpecifiedPersistentAttribute jpa, JavaPersistentType relJPT, IJPAEditorFeatureProvider fp) { JavaPersistentType jpt = (JavaPersistentType)jpa.getParent(); - for (JavaModifiablePersistentAttribute relEntAt : relJPT.getAttributes()) { + for (JavaSpecifiedPersistentAttribute relEntAt : relJPT.getAttributes()) { IResource r = relEntAt.getParent().getResource(); if (!r.exists()) throw new RuntimeException(); @@ -1389,7 +1389,7 @@ public class JpaArtifactFactory { String relTypeName = getRelTypeName(an, relJRA); if (!relTypeName.equals(jpt.getName())) continue; - Hashtable<JavaModifiablePersistentAttribute, Annotation> ht = new Hashtable<JavaModifiablePersistentAttribute, Annotation>(); + Hashtable<JavaSpecifiedPersistentAttribute, Annotation> ht = new Hashtable<JavaSpecifiedPersistentAttribute, Annotation>(); ht.put(relEntAt, an); return ht; } @@ -1412,10 +1412,10 @@ public class JpaArtifactFactory { * @return the entity involved in the bidirectional relationship between the embeddable class and some entity. */ private JavaPersistentType getInvolvedEntity(IJPAEditorFeatureProvider fp, JavaPersistentType jpt, - JavaModifiablePersistentAttribute relEntAt, Annotation an, String[] mappedByStrings) { + JavaSpecifiedPersistentAttribute relEntAt, Annotation an, String[] mappedByStrings) { String mappedBy = mappedByStrings[0]; JavaPersistentType involvedEntity = findJPT(relEntAt, fp, an); - JavaModifiablePersistentAttribute embeddedAttribute = involvedEntity.getAttributeNamed(mappedBy); + JavaSpecifiedPersistentAttribute embeddedAttribute = involvedEntity.getAttributeNamed(mappedBy); if(embeddedAttribute != null){ JavaPersistentType embeddedJPT = findJPT(embeddedAttribute, fp, getAnnotations(embeddedAttribute)[0]); if(embeddedJPT.equals(jpt)) { @@ -1435,7 +1435,7 @@ public class JpaArtifactFactory { * @return the newly created unidirectional relationship. */ private IUnidirectionalRelation produceUniDirRelation( - JavaPersistentType jpt, JavaModifiablePersistentAttribute at, Annotation an, + JavaPersistentType jpt, JavaSpecifiedPersistentAttribute at, Annotation an, JavaPersistentType relJPT, IJPAEditorFeatureProvider fp) { if (isNonOwner(at) || !JPAEditorUtil.getCompilationUnit((JavaPersistentType) at.getParent()).exists()) @@ -1448,7 +1448,7 @@ public class JpaArtifactFactory { } private IUnidirectionalRelation createUniDirRelationshipDependsOnTheType( - JavaPersistentType jpt, JavaModifiablePersistentAttribute at, + JavaPersistentType jpt, JavaSpecifiedPersistentAttribute at, JavaPersistentType relJPT, IJPAEditorFeatureProvider fp, String annotationName) { IUnidirectionalRelation res = null; @@ -1488,8 +1488,8 @@ public class JpaArtifactFactory { * @return the newly created bidirectional relationship. */ private IBidirectionalRelation produceBiDirRelation(JavaPersistentType jpt, - JavaModifiablePersistentAttribute at, Annotation an, - JavaPersistentType relJPT, JavaModifiablePersistentAttribute relAt, + JavaSpecifiedPersistentAttribute at, Annotation an, + JavaPersistentType relJPT, JavaSpecifiedPersistentAttribute relAt, Annotation relAn, IJPAEditorFeatureProvider fp) { String annotationName = JPAEditorUtil.returnSimpleName(an.getAnnotationName()); String relAnnotationName = JPAEditorUtil.returnSimpleName(relAn.getAnnotationName()); @@ -1615,12 +1615,12 @@ public class JpaArtifactFactory { return jpt.getPersistenceUnit(); } - public boolean isMethodAnnotated(JavaModifiablePersistentAttribute attr) { + public boolean isMethodAnnotated(JavaSpecifiedPersistentAttribute attr) { return attr.getResourceAttribute().getAstNodeType() == AstNodeType.METHOD; } public boolean isMethodAnnotated(JavaPersistentType jpt) { - ListIterator<JavaModifiablePersistentAttribute> li = jpt.getAttributes().iterator(); + ListIterator<JavaSpecifiedPersistentAttribute> li = jpt.getAttributes().iterator(); if (!li.hasNext()) return false; return (isMethodAnnotated(li.next())); @@ -1789,7 +1789,7 @@ public class JpaArtifactFactory { IdClassAnnotation an = (IdClassAnnotation)jpt.getJavaResourceType().getAnnotation(IdClassAnnotation.ANNOTATION_NAME); if (an != null) return an.getFullyQualifiedClassName(); - JavaModifiablePersistentAttribute[] ids = getIds(jpt); + JavaSpecifiedPersistentAttribute[] ids = getIds(jpt); if (ids.length == 0) return null; String type = ids[0].getTypeName(); @@ -1797,14 +1797,14 @@ public class JpaArtifactFactory { return (wrapper != null) ? wrapper : type; } - public JavaModifiablePersistentAttribute[] getIds(JavaPersistentType jpt) { - ArrayList<JavaModifiablePersistentAttribute> res = new ArrayList<JavaModifiablePersistentAttribute>(); - for (JavaModifiablePersistentAttribute at : jpt.getAttributes()) { + public JavaSpecifiedPersistentAttribute[] getIds(JavaPersistentType jpt) { + ArrayList<JavaSpecifiedPersistentAttribute> res = new ArrayList<JavaSpecifiedPersistentAttribute>(); + for (JavaSpecifiedPersistentAttribute at : jpt.getAttributes()) { if (isId(at)) { res.add(at); } } - JavaModifiablePersistentAttribute[] ret = new JavaModifiablePersistentAttribute[res.size()]; + JavaSpecifiedPersistentAttribute[] ret = new JavaSpecifiedPersistentAttribute[res.size()]; return res.toArray(ret); } @@ -1821,13 +1821,13 @@ public class JpaArtifactFactory { } public boolean hasPrimaryKey(JavaPersistentType jpt) { - for (JavaModifiablePersistentAttribute at : jpt.getAttributes()) + for (JavaSpecifiedPersistentAttribute at : jpt.getAttributes()) if (isId(at)) return true; return false; } private boolean hasSimplePk(JavaPersistentType jpt) { - for(JavaModifiablePersistentAttribute at : jpt.getAttributes()){ + for(JavaSpecifiedPersistentAttribute at : jpt.getAttributes()){ if(isSimpleId(at) && !hasIDClassAnnotation(jpt)){ return true; } @@ -1835,8 +1835,8 @@ public class JpaArtifactFactory { return false; } - private JavaModifiablePersistentAttribute getSimplePkAttribute(JavaPersistentType jpt){ - for(JavaModifiablePersistentAttribute jpa : jpt.getAttributes()){ + private JavaSpecifiedPersistentAttribute getSimplePkAttribute(JavaPersistentType jpt){ + for(JavaSpecifiedPersistentAttribute jpa : jpt.getAttributes()){ if(isSimpleId(jpa)){ return jpa; } @@ -1853,7 +1853,7 @@ public class JpaArtifactFactory { } private boolean hasEmbeddedPk(JavaPersistentType jpt){ - for(JavaModifiablePersistentAttribute at : jpt.getAttributes()){ + for(JavaSpecifiedPersistentAttribute at : jpt.getAttributes()){ if(isEmbeddedId(at)){ return true; } @@ -1861,8 +1861,8 @@ public class JpaArtifactFactory { return false; } - private JavaModifiablePersistentAttribute getEmbeddedIdAttribute(JavaPersistentType jpt){ - for(JavaModifiablePersistentAttribute jpa : jpt.getAttributes()){ + private JavaSpecifiedPersistentAttribute getEmbeddedIdAttribute(JavaPersistentType jpt){ + for(JavaSpecifiedPersistentAttribute jpa : jpt.getAttributes()){ if(isEmbeddedId(jpa)){ return jpa; } @@ -1874,11 +1874,11 @@ public class JpaArtifactFactory { return (jpa.getMappingKey() == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); } - public boolean isEmbeddedAttribute(JavaModifiablePersistentAttribute jpa) { + public boolean isEmbeddedAttribute(JavaSpecifiedPersistentAttribute jpa) { return (jpa.getMappingKey() == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); } - public String getColumnName(JavaModifiablePersistentAttribute jpa) { + public String getColumnName(JavaSpecifiedPersistentAttribute jpa) { String columnName= null; ColumnAnnotation an = (ColumnAnnotation)jpa. getResourceAttribute(). @@ -1987,10 +1987,10 @@ public class JpaArtifactFactory { * @param inverseJPT - the parent entity (the relationship's inverse/target entity) * @param ownerAttr - the relationship's owner attribute */ - public void calculateDerivedIdAnnotation(JavaPersistentType ownerJPT, JavaPersistentType inverseJPT, JavaModifiablePersistentAttribute ownerAttr) { + public void calculateDerivedIdAnnotation(JavaPersistentType ownerJPT, JavaPersistentType inverseJPT, JavaSpecifiedPersistentAttribute ownerAttr) { String attributeType = null; if(hasSimplePk(inverseJPT)){ - JavaModifiablePersistentAttribute jpa = getSimplePkAttribute(inverseJPT); + JavaSpecifiedPersistentAttribute jpa = getSimplePkAttribute(inverseJPT); attributeType = JPAEditorUtil.getAttributeTypeNameWithGenerics(jpa); } else { if(hasIDClassAnnotation(inverseJPT)){ @@ -2011,7 +2011,7 @@ public class JpaArtifactFactory { * @param inverseIdClassFQN - he type of the primary key of the parent entity */ private void addAppropriateDerivedIdAnnotation(JavaPersistentType ownerJPT, - JavaPersistentType inverseJPT, JavaModifiablePersistentAttribute ownerAttr, + JavaPersistentType inverseJPT, JavaSpecifiedPersistentAttribute ownerAttr, String inverseIdClassFQN) { if(hasIDClassAnnotation(ownerJPT)){ String ownerIdClassFQN = getIdType(ownerJPT); @@ -2039,7 +2039,7 @@ public class JpaArtifactFactory { * @param annotationName - the derived identifier's annotation (either @Id or @MapsId) */ private void addDerivedIdAnnotation(JavaPersistentType ownerJPT, - JavaPersistentType inverseJPT, JavaModifiablePersistentAttribute ownerAttr, + JavaPersistentType inverseJPT, JavaSpecifiedPersistentAttribute ownerAttr, String ownerIdClassFQN, String inverseIdClassFQN, String annotationName) { if(!inverseIdClassFQN.equals(ownerIdClassFQN)){ String attributeType = JPAEditorUtil.returnSimpleName(inverseIdClassFQN); @@ -2064,7 +2064,7 @@ public class JpaArtifactFactory { * @param attributeTypeName - the attribute's type */ private void addFieldInCompositeKeyClass(JavaPersistentType inverseJPT, - JavaModifiablePersistentAttribute ownerAttr, String fqnClass, String attributeTypeName) { + JavaSpecifiedPersistentAttribute ownerAttr, String fqnClass, String attributeTypeName) { IJavaProject javaProject = JavaCore.create(ownerAttr.getJpaProject().getProject()); IType type = getType(javaProject, fqnClass); if(type != null && !type.getField(ownerAttr.getName()).exists()){ diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddAttributeFeatureTest.java index fa21b55b27..932ec7d2a2 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/AddAttributeFeatureTest.java @@ -36,7 +36,7 @@ import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm; import org.eclipse.graphiti.mm.algorithms.Text; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.PictogramElement; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.AddAttributeFeature; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.junit.Before; @@ -48,7 +48,7 @@ public class AddAttributeFeatureTest { private AddContext context; - private JavaModifiablePersistentAttribute jpa; + private JavaSpecifiedPersistentAttribute jpa; private ContainerShape entityShape; @@ -62,7 +62,7 @@ public class AddAttributeFeatureTest { @Before public void setUp() throws Exception { featureProvider = EasyMock.createMock(IJPAEditorFeatureProvider.class); - jpa = EasyMock.createMock(JavaModifiablePersistentAttribute.class); + jpa = EasyMock.createMock(JavaSpecifiedPersistentAttribute.class); context = new AddContext(); context.setNewObject(jpa); context.setTargetContainer(entityShape); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java index 1423b87821..c1bb10a536 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/CreateRelationFeaturesTest.java @@ -34,7 +34,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.CreateManyToManyBiDirRelationFeature; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.CreateManyToManyUniDirRelationFeature; @@ -143,7 +143,7 @@ public class CreateRelationFeaturesTest { assertSame(rel.getInverse(), t2); assertNotNull(t1.getAttributeNamed(rel.getOwnerAttributeName())); assertTrue(JpaArtifactFactory.instance().isMethodAnnotated(t1)); - JavaModifiablePersistentAttribute jpa = t1.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute jpa = t1.getAttributeNamed("id"); assertFalse(isRelationAnnotated(jpa)); jpa = t1.getAttributeNamed(rel.getOwnerAttributeName()); assertTrue(isRelationAnnotated(jpa)); @@ -549,7 +549,7 @@ public class CreateRelationFeaturesTest { return JavaCore.createCompilationUnitFrom(file); } - private boolean isRelationAnnotated(JavaModifiablePersistentAttribute jpa) { + private boolean isRelationAnnotated(JavaSpecifiedPersistentAttribute jpa) { HashSet<String> anNames = JpaArtifactFactory.instance().getAnnotationNames(jpa); Iterator<String> it = anNames.iterator(); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java index cf11799e99..c62e9361df 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/DirectEditAttributeFeatureTest.java @@ -27,7 +27,7 @@ import org.eclipse.graphiti.features.IDirectEditingFeature; import org.eclipse.graphiti.features.IFeatureProvider; import org.eclipse.graphiti.features.context.IDirectEditingContext; import org.eclipse.jdt.core.JavaConventions; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.DirectEditAttributeFeature; import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages; @@ -48,7 +48,7 @@ public class DirectEditAttributeFeatureTest { @Test public void testCheckValueValidStringByJavaConventions() { JavaPersistentType jpt = EasyMock.createNiceMock(JavaPersistentType.class); - JavaModifiablePersistentAttribute jpa = configureJpaForJpt(jpt); + JavaSpecifiedPersistentAttribute jpa = configureJpaForJpt(jpt); expect(jpt.getAttributeNamed(isA(String.class))).andStubReturn(jpa); replay(jpa, jpt); @@ -65,11 +65,11 @@ public class DirectEditAttributeFeatureTest { @Test public void testCheckValueValidStringDuplicateAttribute() { - JavaModifiablePersistentAttribute otherJpa = EasyMock.createMock(JavaModifiablePersistentAttribute.class); + JavaSpecifiedPersistentAttribute otherJpa = EasyMock.createMock(JavaSpecifiedPersistentAttribute.class); JavaPersistentType jpt = EasyMock.createMock(JavaPersistentType.class); expect(jpt.getAttributeNamed("attrName")).andStubReturn(otherJpa); - JavaModifiablePersistentAttribute jpa = configureJpaForJpt(jpt); + JavaSpecifiedPersistentAttribute jpa = configureJpaForJpt(jpt); replay(jpa, jpt, otherJpa); IFeatureProvider provider = replayJpaForNullPe(jpa); @@ -80,15 +80,15 @@ public class DirectEditAttributeFeatureTest { assertEquals(MessageFormat.format(JPAEditorMessages.DirectEditAttributeFeature_attributeExists, "attrName"), feature.checkValueValid("attrName", context)); } - private IFeatureProvider replayJpaForNullPe(JavaModifiablePersistentAttribute jpa) { + private IFeatureProvider replayJpaForNullPe(JavaSpecifiedPersistentAttribute jpa) { IFeatureProvider provider = EasyMock.createMock(IJPAEditorFeatureProvider.class); expect(provider.getBusinessObjectForPictogramElement(null)).andStubReturn(jpa); replay(provider); return provider; } - private JavaModifiablePersistentAttribute configureJpaForJpt(JavaPersistentType jpt) { - JavaModifiablePersistentAttribute jpa = EasyMock.createMock(JavaModifiablePersistentAttribute.class); + private JavaSpecifiedPersistentAttribute configureJpaForJpt(JavaPersistentType jpt) { + JavaSpecifiedPersistentAttribute jpa = EasyMock.createMock(JavaSpecifiedPersistentAttribute.class); expect(jpa.getParent()).andStubReturn(jpt); return jpa; } diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java index af5e891a82..3ee7135713 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RefactorAttributeTypeFeatureTest.java @@ -29,7 +29,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.graphiti.features.context.ICustomContext; import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.RefactorAttributeTypeFeature; @@ -84,7 +84,7 @@ public class RefactorAttributeTypeFeatureTest { public void testAttributeUtils(){ PersistenceUnit pu = JpaArtifactFactory.instance().getPersistenceUnit(jpaProject); JavaPersistentType jpt = (JavaPersistentType)pu.getPersistentType("org.eclipse.Ent"); - JavaModifiablePersistentAttribute at = jpt.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute at = jpt.getAttributeNamed("id"); List<String> lst = JpaArtifactFactory.instance().getAnnotationStrings(at); assertEquals(1, lst.size()); assertTrue(lst.contains("@Id")); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java index c71f1c7b81..a1fcf4aea2 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/feature/RemoveAttributeFeatureTest.java @@ -37,7 +37,7 @@ import org.eclipse.graphiti.mm.pictograms.Anchor; import org.eclipse.graphiti.mm.pictograms.ContainerShape; import org.eclipse.graphiti.mm.pictograms.Shape; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.RemoveAttributeFeature; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; import org.eclipse.jpt.jpadiagrameditor.ui.tests.internal.JPACreateFactory; @@ -96,7 +96,7 @@ public class RemoveAttributeFeatureTest { expect(featureProvider.decreaseAttribsNum(pictogramElement)).andReturn(0); expect(featureProvider.getKeyForBusinessObject(isA(Object.class))).andReturn(""); expect(featureProvider.remove("")).andReturn(null); - expect(featureProvider.getRelationRelatedToAttribute(isA(JavaModifiablePersistentAttribute.class))).andReturn(null); + expect(featureProvider.getRelationRelatedToAttribute(isA(JavaSpecifiedPersistentAttribute.class))).andReturn(null); replay(featureProvider); context = EasyMock.createMock(IRemoveContext.class); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java index bcfa5c3147..85ec90c9e3 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorFeatureProviderTest.java @@ -30,7 +30,7 @@ import org.eclipse.graphiti.features.IDeleteFeature; import org.eclipse.graphiti.features.context.IDeleteContext; import org.eclipse.graphiti.mm.Property; import org.eclipse.graphiti.mm.pictograms.PictogramElement; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.ClickRemoveAttributeButtonFeature; import org.eclipse.jpt.jpadiagrameditor.ui.internal.feature.DeleteJPAEntityFeature; @@ -73,7 +73,7 @@ public class JPAEditorFeatureProviderTest { @Test public void testAttributeDeleteFeature(){ PictogramElement pe = replayPictogramElement(); - JavaModifiablePersistentAttribute jpa = replayAttribute(); + JavaSpecifiedPersistentAttribute jpa = replayAttribute(); expect(solver.getBusinessObjectForKey(businessObjectKey)).andStubReturn(jpa); IJPAEditorFeatureProvider provider = createFeatureProvider(); @@ -123,8 +123,8 @@ public class JPAEditorFeatureProviderTest { return jpt; } - private JavaModifiablePersistentAttribute replayAttribute(){ - JavaModifiablePersistentAttribute attribute = EasyMock.createMock(JavaModifiablePersistentAttribute.class); + private JavaSpecifiedPersistentAttribute replayAttribute(){ + JavaSpecifiedPersistentAttribute attribute = EasyMock.createMock(JavaSpecifiedPersistentAttribute.class); expect(attribute.getName()).andReturn("attribute"); replay(attribute); return attribute; diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java index f3f1f1a72d..97049b8156 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/provider/JPAEditorToolBehaviorProviderTest.java @@ -34,7 +34,7 @@ import org.eclipse.graphiti.mm.pictograms.PictogramElement; import org.eclipse.graphiti.tb.IDecorator; import org.eclipse.graphiti.tb.IToolBehaviorProvider; import org.eclipse.graphiti.tb.ImageDecorator; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.ui.JPAEditorMatchingStrategy; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.JPAEditorToolBehaviorProvider; @@ -155,7 +155,7 @@ public class JPAEditorToolBehaviorProviderTest { public void testGetDoubleClickOnJpaFeature() throws Exception { PictogramElement pe = replayPictogramElement(100, 100); IFile file = replayResource(); - JavaModifiablePersistentAttribute jpa = replayJpa(pe, file); + JavaSpecifiedPersistentAttribute jpa = replayJpa(pe, file); IDiagramTypeProvider dtp = replayDiagramProviderForJpa(pe, jpa); IEclipseFacade eclipseFacade = EasyMock.createMock(IEclipseFacade.class); @@ -222,16 +222,16 @@ public class JPAEditorToolBehaviorProviderTest { return jpt; } - private JavaModifiablePersistentAttribute replayJpa(PictogramElement pe, IFile file){ + private JavaSpecifiedPersistentAttribute replayJpa(PictogramElement pe, IFile file){ IFeatureProvider featureProvider = EasyMock.createMock(IFeatureProvider.class); - JavaModifiablePersistentAttribute jpa = EasyMock.createMock(JavaModifiablePersistentAttribute.class); + JavaSpecifiedPersistentAttribute jpa = EasyMock.createMock(JavaSpecifiedPersistentAttribute.class); expect(featureProvider.getBusinessObjectForPictogramElement(pe)).andStubReturn(jpa); expect(jpa.getResource()).andReturn(file); replay(jpa, featureProvider); return jpa; } - private IDiagramTypeProvider replayDiagramProviderForJpa(PictogramElement pe, JavaModifiablePersistentAttribute jpa) { + private IDiagramTypeProvider replayDiagramProviderForJpa(PictogramElement pe, JavaSpecifiedPersistentAttribute jpa) { IFeatureProvider featureProvider = EasyMock.createMock(IFeatureProvider.class); expect(featureProvider.getBusinessObjectForPictogramElement(pe)).andStubReturn(jpa); IDiagramTypeProvider dtp = EasyMock.createMock(IDiagramTypeProvider.class); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java index 921c04f13e..de62c5a971 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationAttributesTest.java @@ -33,7 +33,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -107,7 +107,7 @@ public class CreateRelationAttributesTest { t2 = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, addressType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute attr = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute attr = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)t1, (JavaPersistentType)t2, null, "add", "add", false, createCompilationUnitFrom(customerFile)); jpaProject.getProject().build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor()); @@ -149,7 +149,7 @@ public class CreateRelationAttributesTest { t2 = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, addressType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute attr = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute attr = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)t1, (JavaPersistentType)t2, null, "address", "address", false, createCompilationUnitFrom((IFile)t1.getResource())); assertNotNull(attr); @@ -199,12 +199,12 @@ public class CreateRelationAttributesTest { t2 = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, creditCardType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute attr = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute attr = JpaArtifactFactory.instance(). addAttribute( featureProvider, (JavaPersistentType)t1, (JavaPersistentType)t2, null, "creditCard", "creditCard", false, createCompilationUnitFrom((IFile)t1.getResource())); assertNotNull(attr); - JavaModifiablePersistentAttribute attr2 = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute attr2 = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)t2, (JavaPersistentType)t1, null, "customer", "customer", false, createCompilationUnitFrom((IFile)t2.getResource())); assertNotNull(attr2); @@ -219,7 +219,7 @@ public class CreateRelationAttributesTest { PersistentAttribute ownerPersistentAttribute = ownerPersistentType.resolveAttribute("creditCard"); assertNotNull(ownerPersistentAttribute); - assertTrue(ownerPersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(ownerPersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping ownerSideMapping = ownerPersistentAttribute.getMapping(); assertTrue(ownerSideMapping instanceof JavaOneToOneMapping); @@ -234,7 +234,7 @@ public class CreateRelationAttributesTest { PersistentAttribute inversePersistentAttribute = inversePersistentType.resolveAttribute("customer"); assertNotNull(inversePersistentAttribute); - assertTrue(inversePersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(inversePersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping inverseSideMapping = inversePersistentAttribute.getMapping(); assertTrue(inverseSideMapping instanceof JavaOneToOneMapping); @@ -274,7 +274,7 @@ public class CreateRelationAttributesTest { t2 = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, phoneType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute attr = JpaArtifactFactory.instance().addAttribute(featureProvider, (JavaPersistentType)t1, (JavaPersistentType)t2, null, "phones", "phones", true, + JavaSpecifiedPersistentAttribute attr = JpaArtifactFactory.instance().addAttribute(featureProvider, (JavaPersistentType)t1, (JavaPersistentType)t2, null, "phones", "phones", true, createCompilationUnitFrom((IFile)t1.getResource())); assertNotNull(attr); @@ -327,12 +327,12 @@ public class CreateRelationAttributesTest { manySidePersistentType = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, reservationType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute singleSideAttribute = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute singleSideAttribute = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)singleSidePersistentType, (JavaPersistentType)manySidePersistentType, null, "reservations", "reservations", true, createCompilationUnitFrom((IFile)singleSidePersistentType.getResource())); assertNotNull(singleSideAttribute); - JavaModifiablePersistentAttribute manySideAttribute = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute manySideAttribute = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)manySidePersistentType, (JavaPersistentType)singleSidePersistentType, null, "cruise", "cruise", false, createCompilationUnitFrom((IFile)manySidePersistentType.getResource())); assertNotNull(manySideAttribute); @@ -348,7 +348,7 @@ public class CreateRelationAttributesTest { PersistentAttribute inversePersistentAttribute = inversePersistentType.resolveAttribute("reservations"); assertNotNull(inversePersistentAttribute); - assertTrue(inversePersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(inversePersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping inverseSideMapping = inversePersistentAttribute.getMapping(); assertTrue(inverseSideMapping instanceof JavaOneToManyMapping); @@ -374,7 +374,7 @@ public class CreateRelationAttributesTest { } assertNotNull(ownerPersistentAttribute); - assertTrue(ownerPersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(ownerPersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping ownerSideMapping = ownerPersistentAttribute.getMapping(); c = 0; @@ -420,7 +420,7 @@ public class CreateRelationAttributesTest { singleSidePersistentType = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, shipType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute mappedAttribute = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute mappedAttribute = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)manySidePersistentType, (JavaPersistentType)singleSidePersistentType, null, "ship", "ship", true, createCompilationUnitFrom((IFile)manySidePersistentType.getResource())); assertNotNull(mappedAttribute); @@ -485,12 +485,12 @@ public class CreateRelationAttributesTest { inverseSidePersistentType = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, customerType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute ownerSideAttribute = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute ownerSideAttribute = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)ownerSidePersistentType, (JavaPersistentType)inverseSidePersistentType, null, "customers", "customers", true, createCompilationUnitFrom((IFile)ownerSidePersistentType.getResource())); assertNotNull(ownerSideAttribute); - JavaModifiablePersistentAttribute inverseSideAttributes = JpaArtifactFactory.instance().addAttribute(featureProvider, (JavaPersistentType)inverseSidePersistentType, (JavaPersistentType)ownerSidePersistentType, null, "reservations", "reservations", true, + JavaSpecifiedPersistentAttribute inverseSideAttributes = JpaArtifactFactory.instance().addAttribute(featureProvider, (JavaPersistentType)inverseSidePersistentType, (JavaPersistentType)ownerSidePersistentType, null, "reservations", "reservations", true, createCompilationUnitFrom((IFile)inverseSidePersistentType.getResource())); assertNotNull(inverseSideAttributes); @@ -504,7 +504,7 @@ public class CreateRelationAttributesTest { PersistentAttribute ownerPersistentAttribute = ownerPersistentType.resolveAttribute("customers"); assertNotNull(ownerPersistentAttribute); - assertTrue(ownerPersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(ownerPersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping ownerSideMapping = ownerPersistentAttribute.getMapping(); assertTrue(ownerSideMapping instanceof JavaManyToManyMapping); @@ -519,7 +519,7 @@ public class CreateRelationAttributesTest { PersistentAttribute inversePersistentAttribute = inversePersistentType.resolveAttribute("reservations"); assertNotNull(inversePersistentAttribute); - assertTrue(inversePersistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(inversePersistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping inverseSideMapping = inversePersistentAttribute.getMapping(); assertTrue(inverseSideMapping instanceof JavaManyToManyMapping); @@ -556,7 +556,7 @@ public class CreateRelationAttributesTest { referencedPersistentType = JpaArtifactFactory.instance().getContextPersistentType(jpaProject, cabinType.getTypeBinding().getQualifiedName()); } - JavaModifiablePersistentAttribute annotatedSideAttribute = JpaArtifactFactory.instance(). + JavaSpecifiedPersistentAttribute annotatedSideAttribute = JpaArtifactFactory.instance(). addAttribute(featureProvider, (JavaPersistentType)annotatedPersistentType, (JavaPersistentType)referencedPersistentType, null, "cabins", "cabins", true, createCompilationUnitFrom((IFile)annotatedPersistentType.getResource())); assertNotNull(annotatedSideAttribute); @@ -571,7 +571,7 @@ public class CreateRelationAttributesTest { PersistentAttribute persistentAttribute = persistentType.resolveAttribute("cabins"); assertNotNull(persistentAttribute); - assertTrue(persistentAttribute instanceof JavaModifiablePersistentAttribute); + assertTrue(persistentAttribute instanceof JavaSpecifiedPersistentAttribute); AttributeMapping mapping = persistentAttribute.getMapping(); assertTrue(mapping instanceof JavaManyToManyMapping); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java index cde9e0207d..9d11ef5adf 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsInFieldAnnotatedEntitiesTest.java @@ -28,7 +28,7 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.IJPAEditorFeatureProvider; @@ -109,7 +109,7 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("OneToOne")); @@ -159,13 +159,13 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("OneToOne")); assertNull(((OwnableRelationshipMappingAnnotation)ownerAt.getMapping()).getMappedBy()); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); annotations = JpaArtifactFactory.instance().getAnnotationNames(inverseAt); assertTrue(annotations.contains("OneToOne")); @@ -219,7 +219,7 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("OneToMany")); @@ -269,7 +269,7 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("ManyToOne")); @@ -320,12 +320,12 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("ManyToOne")); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); annotations = JpaArtifactFactory.instance().getAnnotationNames(inverseAt); assertTrue(annotations.contains("OneToMany")); @@ -379,7 +379,7 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("ManyToMany")); @@ -430,13 +430,13 @@ public class CreateRelationsInFieldAnnotatedEntitiesTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Set<String> annotations = JpaArtifactFactory.instance().getAnnotationNames(ownerAt); assertTrue(annotations.contains("ManyToMany")); assertNull(((OwnableRelationshipMappingAnnotation)ownerAt.getMapping()).getMappedBy()); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); annotations = JpaArtifactFactory.instance().getAnnotationNames(inverseAt); assertTrue(annotations.contains("ManyToMany")); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java index 3931c0f55e..efb1f7d87a 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/relation/CreateRelationsTest.java @@ -32,7 +32,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; @@ -144,7 +144,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); OneToOneAnnotation an = (OneToOneAnnotation)ownerAt.getResourceAttribute().getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNotNull(an); @@ -160,13 +160,13 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); OneToOneAnnotation an = (OneToOneAnnotation)ownerAt.getResourceAttribute().getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNotNull(an); assertNull(an.getMappedBy()); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); an = (OneToOneAnnotation)inverseAt.getResourceAttribute().getAnnotation(OneToOneAnnotation.ANNOTATION_NAME); assertNotNull(an); @@ -182,7 +182,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); OneToManyAnnotation an = (OneToManyAnnotation)ownerAt.getResourceAttribute().getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); @@ -198,7 +198,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); ManyToOneAnnotation an = (ManyToOneAnnotation)ownerAt.getResourceAttribute().getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNotNull(an); @@ -211,13 +211,13 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); ManyToOneAnnotation an = (ManyToOneAnnotation)ownerAt.getResourceAttribute().getAnnotation(ManyToOneAnnotation.ANNOTATION_NAME); assertNotNull(an); assertEquals("customer", rel.getInverseAttributeName()); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); OneToManyAnnotation an1 = (OneToManyAnnotation)inverseAt.getResourceAttribute().getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); assertNotNull(an1); @@ -231,7 +231,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); ManyToManyAnnotation an = (ManyToManyAnnotation)ownerAt.getResourceAttribute().getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNotNull(an); @@ -245,13 +245,13 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); ManyToManyAnnotation an = (ManyToManyAnnotation)ownerAt.getResourceAttribute().getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNotNull(an); assertNull(an.getMappedBy()); - JavaModifiablePersistentAttribute inverseAt = t2.getAttributeNamed("customer"); + JavaSpecifiedPersistentAttribute inverseAt = t2.getAttributeNamed("customer"); assertNotNull(inverseAt); an = (ManyToManyAnnotation)inverseAt.getResourceAttribute().getAnnotation(ManyToManyAnnotation.ANNOTATION_NAME); assertNotNull(an); @@ -300,7 +300,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("address", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("address"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("address"); assertNotNull(ownerAt); Object o1 = ownerAt.getResourceAttribute().getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); @@ -362,7 +362,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("project", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("project"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("project"); assertNotNull(ownerAt); Object o1 = ownerAt.getResourceAttribute().getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); @@ -422,7 +422,7 @@ public class CreateRelationsTest { assertSame(t1, rel.getOwner()); assertSame(t2, rel.getInverse()); assertEquals("person", rel.getOwnerAttributeName()); - JavaModifiablePersistentAttribute ownerAt = t1.getAttributeNamed("person"); + JavaSpecifiedPersistentAttribute ownerAt = t1.getAttributeNamed("person"); assertNotNull(ownerAt); Object o1 = ownerAt.getResourceAttribute().getAnnotation(OneToManyAnnotation.ANNOTATION_NAME); diff --git a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java index d1ac8c9fae..eaf8bc4df9 100644 --- a/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java +++ b/jpa_diagram_editor/tests/org.eclipse.jpt.jpadiagrameditor.ui.tests/src/org/eclipse/jpt/jpadiagrameditor/ui/tests/internal/util/JPAEditorUtilTest.java @@ -37,7 +37,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.context.java.JavaModifiablePersistentAttribute; +import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.IPeServiceUtil; import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants; @@ -276,7 +276,7 @@ public class JPAEditorUtilTest { return; assertNotNull(JPAEditorUtil.getText(t1)); assertNotNull(JPAEditorUtil.getTooltipText(t1)); - JavaModifiablePersistentAttribute jpa = t1.getAttributeNamed("id"); + JavaSpecifiedPersistentAttribute jpa = t1.getAttributeNamed("id"); assertNotNull(jpa); assertNotNull(JPAEditorUtil.getText(jpa)); assertNotNull(JPAEditorUtil.getTooltipText(jpa)); |