diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core')
15 files changed, 96 insertions, 83 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java index e6c73132b1..c9c2750270 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/EclipseLinkJpaPlatformFactory.java @@ -35,12 +35,25 @@ public class EclipseLinkJpaPlatformFactory public JpaPlatform buildJpaPlatform(String id) { return new GenericJpaPlatform( id, + buildJpaVersion(), new EclipseLinkJpaFactory(), buildJpaAnnotationProvider(), EclipseLinkJpaPlatformProvider.instance(), buildJpaPlatformVariation()); } + private JpaPlatform.Version buildJpaVersion() { + return new JpaPlatform.Version() { + public boolean is2_0Compatible() { + return false; + } + + public int getJpaVersion() { + return 1; + } + }; + } + protected JpaAnnotationProvider buildJpaAnnotationProvider() { return new GenericJpaAnnotationProvider( GenericJpaAnnotationDefinitionProvider.instance(), diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java index e06cae072a..a55a364f44 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicCollectionMapping.java @@ -9,13 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicCollectionMapping; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkBasicCollectionAnnotation; -import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; public class JavaEclipseLinkBasicCollectionMapping extends AbstractJavaAttributeMapping<EclipseLinkBasicCollectionAnnotation> @@ -33,8 +31,4 @@ public class JavaEclipseLinkBasicCollectionMapping public String getAnnotationName() { return EclipseLinkBasicCollectionAnnotation.ANNOTATION_NAME; } - - public Iterator<String> supportingAnnotationNames() { - return EmptyIterator.instance(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java index e9b61559bc..f47d1728eb 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapMapping.java @@ -9,13 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkBasicMapMapping; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkBasicMapAnnotation; -import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; public class JavaEclipseLinkBasicMapMapping extends AbstractJavaAttributeMapping<EclipseLinkBasicMapAnnotation> @@ -33,8 +31,4 @@ public class JavaEclipseLinkBasicMapMapping public String getAnnotationName() { return EclipseLinkBasicMapAnnotation.ANNOTATION_NAME; } - - public Iterator<String> supportingAnnotationNames() { - return EmptyIterator.instance(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java index 9ecef2b75b..1529dee16c 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkBasicMapping.java @@ -21,8 +21,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkConvertAnnotation; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; import org.eclipse.jpt.utility.Filter; -import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -41,13 +40,12 @@ public class JavaEclipseLinkBasicMapping //************** JavaAttributeMapping implementation *************** @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - new ArrayIterator<String>( - EclipseLink.MUTABLE, - EclipseLink.CONVERT)); - } + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.MUTABLE, + EclipseLink.CONVERT); + } //************** AbstractJavaBasicMapping implementation *************** diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java index e3f1670c7e..e6780dda60 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java @@ -21,8 +21,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkConvertAnnotation; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; import org.eclipse.jpt.utility.Filter; -import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -40,13 +39,12 @@ public class JavaEclipseLinkIdMapping //************** JavaAttributeMapping implementation *************** @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - new ArrayIterator<String>( - EclipseLink.MUTABLE, - EclipseLink.CONVERT)); - } + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.MUTABLE, + EclipseLink.CONVERT); + } //************** AbstractJavaIdMapping overrides *************** diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java index 036f433946..576b85d2d8 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java @@ -17,6 +17,7 @@ import org.eclipse.jpt.core.internal.context.java.AbstractJavaManyToManyMapping; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -34,11 +35,11 @@ public class JavaEclipseLinkManyToManyMapping } @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), EclipseLink.JOIN_FETCH); - } + } public EclipseLinkJoinFetch getJoinFetch() { return this.joinFetch; diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java index 8a496217b1..6ed808fbaf 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkManyToOneMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; @@ -17,7 +16,7 @@ import org.eclipse.jpt.core.internal.context.java.AbstractJavaManyToOneMapping; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkRelationshipMapping; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -34,11 +33,10 @@ public class JavaEclipseLinkManyToOneMapping } @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - EclipseLink.JOIN_FETCH - ); + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.JOIN_FETCH); } public EclipseLinkJoinFetch getJoinFetch() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java index 01575e0717..cd349e9870 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToManyMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; @@ -20,8 +19,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkPrivateOwnedAnnotation; -import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -46,13 +44,12 @@ public class JavaEclipseLinkOneToManyMapping } @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - new ArrayIterator<String>( - EclipseLink.JOIN_FETCH, - EclipseLink.PRIVATE_OWNED)); - } + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.JOIN_FETCH, + EclipseLink.PRIVATE_OWNED); + } @Override public JavaEclipseLinkOneToManyRelationshipReference getRelationshipReference() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java index dbe407929b..94a651a1c6 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkOneToOneMapping.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; @@ -18,8 +17,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToOneMapping; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; -import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -37,14 +35,13 @@ public class JavaEclipseLinkOneToOneMapping this.joinFetch = new JavaEclipseLinkJoinFetch(this); this.privateOwned = new JavaEclipseLinkPrivateOwned(this); } - + @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - new ArrayIterator<String>( - EclipseLink.JOIN_FETCH, - EclipseLink.PRIVATE_OWNED)); + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.JOIN_FETCH, + EclipseLink.PRIVATE_OWNED); } public EclipseLinkJoinFetch getJoinFetch() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java index 44eb6494a5..b154fb38fa 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkTransformationMapping.java @@ -9,13 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkTransformationMapping; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkTransformationAnnotation; -import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; public class JavaEclipseLinkTransformationMapping extends AbstractJavaAttributeMapping<EclipseLinkTransformationAnnotation> @@ -33,8 +31,4 @@ public class JavaEclipseLinkTransformationMapping public String getAnnotationName() { return EclipseLinkTransformationAnnotation.ANNOTATION_NAME; } - - public Iterator<String> supportingAnnotationNames() { - return EmptyIterator.instance(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java index 56299294f7..c270c6a4bd 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVariableOneToOneMapping.java @@ -9,13 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.core.internal.context.java; -import java.util.Iterator; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.context.java.AbstractJavaAttributeMapping; import org.eclipse.jpt.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkVariableOneToOneAnnotation; -import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; public class JavaEclipseLinkVariableOneToOneMapping extends AbstractJavaAttributeMapping<EclipseLinkVariableOneToOneAnnotation> @@ -33,8 +31,4 @@ public class JavaEclipseLinkVariableOneToOneMapping public String getAnnotationName() { return EclipseLinkVariableOneToOneAnnotation.ANNOTATION_NAME; } - - public Iterator<String> supportingAnnotationNames() { - return EmptyIterator.instance(); - } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java index 6b6cf31bca..03be7b26dd 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/java/JavaEclipseLinkVersionMapping.java @@ -21,8 +21,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLinkConvertAnnotation; import org.eclipse.jpt.eclipselink.core.resource.java.EclipseLink; import org.eclipse.jpt.utility.Filter; -import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.ArrayTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -40,13 +39,12 @@ public class JavaEclipseLinkVersionMapping //************** JavaAttributeMapping implementation *************** @Override - public Iterator<String> supportingAnnotationNames() { - return new CompositeIterator<String>( - super.supportingAnnotationNames(), - new ArrayIterator<String>( - EclipseLink.MUTABLE, - EclipseLink.CONVERT)); - } + protected String[] buildSupportingAnnotationNames() { + return ArrayTools.addAll( + super.buildSupportingAnnotationNames(), + EclipseLink.MUTABLE, + EclipseLink.CONVERT); + } //************** EclipseLinkVersionMapping overrides *************** diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java index a802be6264..f297bd0be2 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v1_1/EclipseLink1_1JpaPlatformFactory.java @@ -37,6 +37,7 @@ public class EclipseLink1_1JpaPlatformFactory public JpaPlatform buildJpaPlatform(String id) { return new GenericJpaPlatform( id, + buildJpaVersion(), new EclipseLinkJpaFactory(), buildJpaAnnotationProvider(), EclipseLink1_1JpaPlatformProvider.instance(), @@ -59,4 +60,16 @@ public class EclipseLink1_1JpaPlatformFactory } }; } + + private JpaPlatform.Version buildJpaVersion() { + return new JpaPlatform.Version() { + public boolean is2_0Compatible() { + return false; + } + + public int getJpaVersion() { + return 1; + } + }; + } } diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java index d4fd2e19f4..161564a64a 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaFactory.java @@ -11,6 +11,9 @@ package org.eclipse.jpt.eclipselink.core.internal.v2_0; import org.eclipse.jpt.core.context.persistence.Persistence; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.jpa2.context.java.GenericJavaDerivedId2_0; +import org.eclipse.jpt.core.jpa2.context.java.JavaDerivedId2_0; +import org.eclipse.jpt.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.eclipse.jpt.eclipselink.core.internal.EclipseLinkJpaFactory; import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.persistence.EclipseLinkPersistenceUnit2_0; @@ -32,5 +35,13 @@ public class EclipseLink2_0JpaFactory public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersistenceUnit xmlPersistenceUnit) { return new EclipseLinkPersistenceUnit2_0(parent, xmlPersistenceUnit); } + + + // ********** Java Context Model ********** + + @Override + public JavaDerivedId2_0 buildJavaDerivedId(JavaSingleRelationshipMapping2_0 parent) { + return new GenericJavaDerivedId2_0(parent); + } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java index 11e56523af..6a4f6abba1 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/EclipseLink2_0JpaPlatformFactory.java @@ -35,12 +35,25 @@ public class EclipseLink2_0JpaPlatformFactory public JpaPlatform buildJpaPlatform(String id) { return new GenericJpaPlatform( id, + buildJpaVersion(), new EclipseLink2_0JpaFactory(), this.buildJpaAnnotationProvider(), EclipseLink2_0JpaPlatformProvider.instance(), this.buildJpaVariation()); } - + + private JpaPlatform.Version buildJpaVersion() { + return new JpaPlatform.Version() { + public boolean is2_0Compatible() { + return true; + } + + public int getJpaVersion() { + return 2; + } + }; + } + protected JpaAnnotationProvider buildJpaAnnotationProvider() { return new GenericJpaAnnotationProvider( Generic2_0JpaAnnotationDefinitionProvider.instance(), |