diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src')
299 files changed, 1348 insertions, 4723 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 dfe94055de..1a165bd8e1 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 @@ -19,6 +19,7 @@ import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; import org.eclipse.jpt.jpa.core.context.MappingFile; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -28,6 +29,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; @@ -58,7 +65,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaNamedNativeQuery; 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.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -76,12 +82,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -223,17 +223,17 @@ public interface JpaFactory JavaJoinTable buildJavaJoinTable(JavaJoinTableRelationshipStrategy parent, Table.Owner owner); - JavaVirtualJoinTable buildJavaVirtualJoinTable(JavaVirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable); + VirtualJoinTable buildJavaVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable); JavaColumn buildJavaColumn(JpaContextNode parent, JavaColumn.Owner owner); - JavaVirtualColumn buildJavaVirtualColumn(JpaContextNode parent, JavaVirtualColumn.Owner owner); + VirtualColumn buildJavaVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner); JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, ReadOnlyNamedDiscriminatorColumn.Owner owner); JavaJoinColumn buildJavaJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, CompleteJoinColumnAnnotation joinColumnAnnotation); - JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); + VirtualJoinColumn buildJavaVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent, Table.Owner owner, SecondaryTableAnnotation tableAnnotation); @@ -259,7 +259,7 @@ public interface JpaFactory JavaOverrideRelationship buildJavaOverrideRelationship(JavaAssociationOverride parent); - JavaVirtualOverrideRelationship buildJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent); + VirtualOverrideRelationship buildJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent); JavaQueryContainer buildJavaQueryContainer(JpaContextNode parent, JavaQueryContainer.Owner owner); @@ -271,7 +271,7 @@ public interface JpaFactory JavaUniqueConstraint buildJavaUniqueConstraint(JpaContextNode parent, UniqueConstraint.Owner owner, UniqueConstraintAnnotation constraintAnnotation); - JavaVirtualUniqueConstraint buildJavaVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint); + VirtualUniqueConstraint buildJavaVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint); JavaBaseEnumeratedConverter buildJavaBaseEnumeratedConverter(JavaAttributeMapping parent, BaseEnumeratedAnnotation annotation, JavaConverter.Owner owner); @@ -279,5 +279,5 @@ public interface JpaFactory JavaLobConverter buildJavaLobConverter(JavaAttributeMapping parent, LobAnnotation annotation, JavaConverter.Owner owner); - JavaOrderable buildJavaOrderable(JavaAttributeMapping parent); + Orderable buildJavaOrderable(JavaAttributeMapping parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverride.java index 07f9c95e90..bffe76f91b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaAssociationOverride - extends JavaReadOnlyAssociationOverride, AssociationOverride, JavaOverride + extends AssociationOverride, JavaOverride { JavaVirtualAssociationOverride convertToVirtual(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java index 9677de19a6..83b9926f8f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface JavaAssociationOverrideContainer @@ -39,8 +39,6 @@ public interface JavaAssociationOverrideContainer ReadOnlyOverrideRelationship getOverrideRelationship(String overrideName); // covariant overrides - ListIterable<JavaReadOnlyAssociationOverride> getOverrides(); - JavaReadOnlyAssociationOverride getOverrideNamed(String name); ListIterable<JavaAssociationOverride> getSpecifiedOverrides(); JavaAssociationOverride getSpecifiedOverride(int index); JavaAssociationOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverride.java index 5b992d9ed7..854981bc06 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaAttributeOverride - extends JavaReadOnlyAttributeOverride, AttributeOverride, JavaOverride + extends AttributeOverride, JavaOverride { JavaVirtualAttributeOverride convertToVirtual(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java index 039cfd4a2d..f05b62af4d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -39,8 +39,6 @@ public interface JavaAttributeOverrideContainer ReadOnlyColumn getOverrideColumn(String overrideName); // covariant overrides - ListIterable<JavaReadOnlyAttributeOverride> getOverrides(); - JavaReadOnlyAttributeOverride getOverrideNamed(String name); ListIterable<JavaAttributeOverride> getSpecifiedOverrides(); JavaAttributeOverride getSpecifiedOverride(int index); JavaAttributeOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseColumn.java index bca2d1b354..c51b3314c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.BaseColumnAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaBaseColumn - extends BaseColumn, JavaNamedColumn, JavaReadOnlyBaseColumn + extends BaseColumn, JavaNamedColumn { BaseColumnAnnotation getColumnAnnotation(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java index 6a2cfad22b..d36e13e17a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseEnumeratedConverter.java @@ -9,7 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; +import org.eclipse.jpt.common.core.resource.java.Annotation; +import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.Converter; +import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumerated2_0Annotation; +import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; /** * Java enumerated/map key enumerated converter @@ -24,4 +29,60 @@ public interface JavaBaseEnumeratedConverter extends BaseEnumeratedConverter, JavaConverter { // combine interfaces + + // ********** enumerated adapter ********** + + public static class BasicAdapter + extends JavaConverter.AbstractAdapter + { + private static final BasicAdapter INSTANCE = new BasicAdapter(); + public static BasicAdapter instance() { + return INSTANCE; + } + + private BasicAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseEnumeratedConverter.class; + } + + @Override + protected String getAnnotationName() { + return EnumeratedAnnotation.ANNOTATION_NAME; + } + + public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { + return factory.buildJavaBaseEnumeratedConverter(parent, (EnumeratedAnnotation) converterAnnotation, this.buildOwner()); + } + } + + // ********** map key enumerated adapter ********** + + public static class MapKeyAdapter + extends JavaConverter.AbstractAdapter + { + private static final MapKeyAdapter INSTANCE = new MapKeyAdapter(); + public static MapKeyAdapter instance() { + return INSTANCE; + } + + private MapKeyAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseEnumeratedConverter.class; + } + + @Override + protected String getAnnotationName() { + return MapKeyEnumerated2_0Annotation.ANNOTATION_NAME; + } + + public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { + return factory.buildJavaBaseEnumeratedConverter(parent, (MapKeyEnumerated2_0Annotation) converterAnnotation, this.buildOwner()); + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseJoinColumn.java index 043eeae1f1..871b4da418 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.BaseJoinColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface JavaBaseJoinColumn - extends BaseJoinColumn, JavaNamedColumn, JavaReadOnlyBaseJoinColumn + extends BaseJoinColumn, JavaNamedColumn { // combine interfaces } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java index e0b9be5cae..5357d762f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaBaseTemporalConverter.java @@ -9,7 +9,17 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; +import org.eclipse.jpt.common.core.resource.java.Annotation; +import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; +import org.eclipse.jpt.jpa.core.context.Converter; +import org.eclipse.jpt.jpa.core.internal.context.JptValidator; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaElementCollectionTemporalConverterValidator; +import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaTemporalConverterValidator; +import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaMapKeyTemporalConverterValidator; +import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation; +import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; /** * Java temporal/map key temporal converter @@ -24,4 +34,110 @@ public interface JavaBaseTemporalConverter extends BaseTemporalConverter, JavaConverter { // combine interfaces + + + // ********** adapter ********** + + abstract static class AbstractAdapter + extends JavaConverter.AbstractAdapter + { + + AbstractAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseTemporalConverter.class; + } + + @Override + protected String getAnnotationName() { + return TemporalAnnotation.ANNOTATION_NAME; + } + + public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { + return factory.buildJavaBaseTemporalConverter(parent, (TemporalAnnotation) converterAnnotation, this.buildOwner()); + } + } + + public static class BasicAdapter + extends AbstractAdapter + { + private static final Adapter INSTANCE = new BasicAdapter(); + public static Adapter instance() { + return INSTANCE; + } + + private BasicAdapter() { + super(); + } + + @Override + protected Owner buildOwner() { + return new Owner() { + public JptValidator buildValidator(Converter converter) { + return new JavaTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + } + + public static class ElementCollectionAdapter + extends AbstractAdapter + { + private static final Adapter INSTANCE = new ElementCollectionAdapter(); + public static Adapter instance() { + return INSTANCE; + } + + private ElementCollectionAdapter() { + super(); + } + + @Override + protected Owner buildOwner() { + return new Owner() { + public JptValidator buildValidator(Converter converter) { + return new JavaElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + } + + // ********** map key temporal adapter ********** + + public static class MapKeyAdapter + extends JavaConverter.AbstractAdapter + { + private static final MapKeyAdapter INSTANCE = new MapKeyAdapter(); + public static MapKeyAdapter instance() { + return INSTANCE; + } + + private MapKeyAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseTemporalConverter.class; + } + + @Override + protected String getAnnotationName() { + return MapKeyTemporal2_0Annotation.ANNOTATION_NAME; + } + + public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { + return factory.buildJavaBaseTemporalConverter((JavaCollectionMapping2_0) parent, (MapKeyTemporal2_0Annotation) converterAnnotation, this.buildOwner()); + } + + @Override + protected Owner buildOwner() { + return new Owner() { + public JptValidator buildValidator(Converter converter) { + return new JavaMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCascade.java deleted file mode 100644 index 9e0bb467bf..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCascade.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.Cascade; - -/** - * Java cascade (persist, merge, remove, refresh) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaCascade - extends Cascade -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCollectionMapping.java deleted file mode 100644 index 3c0a4fb3eb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaCollectionMapping.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.CollectionMapping; - -/** - * JPA Java collection mapping (e.g. 1:m, m:m, element collection) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaCollectionMapping - extends CollectionMapping, JavaAttributeMapping -{ - JavaOrderable getOrderable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java index f7daf72fe4..9c779ae609 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDiscriminatorColumn.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; * @since 2.0 */ public interface JavaDiscriminatorColumn - extends DiscriminatorColumn, JavaNamedDiscriminatorColumn + extends DiscriminatorColumn, JavaNamedColumn { DiscriminatorColumnAnnotation getColumnAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEnumeratedConverter.java deleted file mode 100644 index f456ab8787..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEnumeratedConverter.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.jpa.core.JpaFactory; -import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.resource.java.EnumeratedAnnotation; - -/** - * Java enumerated converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaEnumeratedConverter - extends JavaBaseEnumeratedConverter -{ - // ********** adapter ********** - - public static class Adapter - extends JavaConverter.AbstractAdapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseEnumeratedConverter.class; - } - - @Override - protected String getAnnotationName() { - return EnumeratedAnnotation.ANNOTATION_NAME; - } - - public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { - return factory.buildJavaBaseEnumeratedConverter(parent, (EnumeratedAnnotation) converterAnnotation, this.buildOwner()); - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumn.java index 2055eae120..25a69baa26 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.CompleteJoinColumnAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface JavaJoinColumn - extends JoinColumn, JavaReadOnlyJoinColumn, JavaBaseJoinColumn, JavaBaseColumn + extends JoinColumn, JavaBaseJoinColumn, JavaBaseColumn { CompleteJoinColumnAnnotation getColumnAnnotation(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationship.java index b42bc14b39..c647aa3159 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.JoinColumnRelationship; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface JavaJoinColumnRelationship - extends JoinColumnRelationship, JavaRelationship + extends JoinColumnRelationship { JavaJoinColumnRelationshipStrategy getJoinColumnStrategy(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java index cf5e5dc3af..f8571d77c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.JoinColumnRelationshipStrategy; * @since 2.2 */ public interface JavaJoinColumnRelationshipStrategy - extends JoinColumnRelationshipStrategy, JavaRelationshipStrategy + extends JoinColumnRelationshipStrategy { ListIterable<JavaJoinColumn> getJoinColumns(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationship.java index 2418a7d02e..d7ff6bc75c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.JoinTableRelationship; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface JavaJoinTableRelationship - extends JoinTableRelationship, JavaRelationship + extends JoinTableRelationship { JavaJoinTableRelationshipStrategy getJoinTableStrategy(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationshipStrategy.java index c6c912fa07..e78281572c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTableRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.2 */ public interface JavaJoinTableRelationshipStrategy - extends JoinTableRelationshipStrategy, JavaRelationshipStrategy + extends JoinTableRelationshipStrategy { JavaJoinTable getJoinTable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaManyToManyMapping.java index 9e2544dc8f..ef09edaae4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaManyToManyMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface JavaManyToManyMapping - extends ManyToManyMapping, JavaMultiRelationshipMapping + extends ManyToManyMapping, JavaRelationshipMapping { ManyToManyAnnotation getMappingAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationship.java index 4a7fec62be..6defa44943 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,13 +21,12 @@ import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotati * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface JavaMappedByRelationship - extends MappedByRelationship, JavaRelationship + extends MappedByRelationship { - JavaMappedByRelationshipStrategy getMappedByStrategy(); OwnableRelationshipMappingAnnotation getMappingAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationshipStrategy.java deleted file mode 100644 index 77b3356adb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappedByRelationshipStrategy.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; - -/** - * Java "mapped by" relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.2 - * @since 2.2 - */ -public interface JavaMappedByRelationshipStrategy - extends JavaRelationshipStrategy, MappedByRelationshipStrategy -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappingRelationship.java index e47c8299b1..eb7522c7b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappingRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMappingRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.MappingRelationship; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface JavaMappingRelationship - extends MappingRelationship, JavaRelationship + extends MappingRelationship { JavaRelationshipMapping getMapping(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMultiRelationshipMapping.java deleted file mode 100644 index d0ceb37255..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaMultiRelationshipMapping.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.MultiRelationshipMapping; - -/** - * Java multi-valued relationship (1:m, m:m) mapping. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.0 - */ -public interface JavaMultiRelationshipMapping - extends MultiRelationshipMapping, JavaRelationshipMapping, JavaCollectionMapping -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedColumn.java index 6fbca4a8f3..214107598e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -27,11 +27,11 @@ import org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaNamedColumn - extends NamedColumn, JavaReadOnlyNamedColumn + extends NamedColumn { NamedColumnAnnotation getColumnAnnotation(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedDiscriminatorColumn.java deleted file mode 100644 index ebbfe73a6e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaNamedDiscriminatorColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.NamedDiscriminatorColumn; - -/** - * Java named discriminator column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.1 - * @since 3.1 - */ -public interface JavaNamedDiscriminatorColumn - extends NamedDiscriminatorColumn, JavaNamedColumn -{ - //combining interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOneToManyMapping.java index dc6461010b..1af9edd217 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOneToManyMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface JavaOneToManyMapping - extends OneToManyMapping, JavaMultiRelationshipMapping + extends OneToManyMapping, JavaRelationshipMapping { OneToManyAnnotation getMappingAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOrderable.java deleted file mode 100644 index f73fda52ad..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOrderable.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.Orderable; - -/** - * Multi-valued (1:m, m:m) relationship mappings support ordering. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaOrderable - extends Orderable -{ - JavaAttributeMapping getParent(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverride.java index d7ccd3b444..76a2606b1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.java.OverrideAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 + * @version 3.3 * @since 2.3 */ public interface JavaOverride - extends Override_, JavaReadOnlyOverride + extends Override_ { OverrideAnnotation getOverrideAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java index 6aa6dbdc3d..4c991aae40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java @@ -41,8 +41,6 @@ public interface JavaOverrideContainer Iterable<String> getOverrideNames(); // covariant overrides - ListIterable<? extends JavaReadOnlyOverride> getOverrides(); - JavaReadOnlyOverride getOverrideNamed(String name); ListIterable<? extends JavaOverride> getSpecifiedOverrides(); JavaOverride getSpecifiedOverride(int index); JavaOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java index 6c5dfea50d..003d4fdf02 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumnRelationshipStrategy * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface JavaPrimaryKeyJoinColumnRelationshipStrategy - extends JavaRelationshipStrategy, PrimaryKeyJoinColumnRelationshipStrategy + extends PrimaryKeyJoinColumnRelationshipStrategy { ListIterable<JavaPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns(); JavaPrimaryKeyJoinColumn getPrimaryKeyJoinColumn(int index); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAssociationOverride.java deleted file mode 100644 index 72aca913ba..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAssociationOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; - -/** - * Java read-only association override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyAssociationOverride - extends ReadOnlyAssociationOverride, JavaReadOnlyOverride -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAttributeOverride.java deleted file mode 100644 index 151b828022..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyAttributeOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; - -/** - * Read-only Java attribute override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyAttributeOverride - extends ReadOnlyAttributeOverride, JavaReadOnlyOverride -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java deleted file mode 100644 index 7f58a626e9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; - -/** - * Java read-only column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyBaseColumn - extends ReadOnlyBaseColumn, JavaReadOnlyTableColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java deleted file mode 100644 index d3b0ea5dcd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyBaseJoinColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; - -/** - * Java read-only join column or primary key join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyBaseJoinColumn - extends ReadOnlyBaseJoinColumn, JavaReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java deleted file mode 100644 index fb1e177c58..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyJoinColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; - -/** - * Java read-only join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.0 - */ -public interface JavaReadOnlyJoinColumn - extends ReadOnlyJoinColumn, JavaReadOnlyBaseJoinColumn, JavaReadOnlyBaseColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java deleted file mode 100644 index fd2c6bd4c0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedColumn.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; - -/** - * Java read-only - * <ul> - * <li>column - * <li>join column - * <li>primary key join column - * <li>discriminator column - * <li>order column - * </ul> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyNamedColumn - extends ReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java deleted file mode 100644 index c958afd3fa..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyNamedDiscriminatorColumn.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; - - -/** - * Java base discriminator column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 3.1 - */ -public interface JavaReadOnlyNamedDiscriminatorColumn - extends ReadOnlyNamedDiscriminatorColumn, JavaReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java deleted file mode 100644 index 128220ab35..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; - -/** - * Read-only Java override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyOverride - extends ReadOnlyOverride -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationship.java deleted file mode 100644 index 399bbb6418..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; - -/** - * Java relationship (join column, join table, mapped by, primary key join - * column, mapping) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyRelationship - extends ReadOnlyRelationship -{ - JavaReadOnlyRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationshipStrategy.java deleted file mode 100644 index 0c944e51d3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; - -/** - * Java read-only relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyRelationshipStrategy - extends ReadOnlyRelationshipStrategy -{ - JavaReadOnlyRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java deleted file mode 100644 index 2bf4ec624c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTable.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; - -/** - * Java read-only table - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyTable - extends ReadOnlyTable -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java deleted file mode 100644 index be6cfff6e1..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyTableColumn.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; - -/** - * Java read-only column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyTableColumn - extends ReadOnlyTableColumn, JavaReadOnlyNamedColumn -{ -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyUniqueConstraint.java deleted file mode 100644 index 9167007d7b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReadOnlyUniqueConstraint.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; - -/** - * Java read-only unique constraint - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaReadOnlyUniqueConstraint - extends ReadOnlyUniqueConstraint -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationship.java deleted file mode 100644 index 088cd7bd3a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationship.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.Relationship; - -/** - * Java relationship (join column, join table, mapped by, primary key join - * column, mapping) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.2 - * @since 2.2 - */ -public interface JavaRelationship - extends Relationship, JavaReadOnlyRelationship -{ - JavaRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipMapping.java index a2a85098ac..e1a74de825 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipMapping.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.java.RelationshipMappingAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface JavaRelationshipMapping @@ -31,7 +31,5 @@ public interface JavaRelationshipMapping RelationshipMappingAnnotation getAnnotationForUpdate(); - JavaCascade getCascade(); - JavaMappingRelationship getRelationship(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipStrategy.java deleted file mode 100644 index f658507620..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaRelationshipStrategy.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; - -/** - * Java relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.2 - */ -public interface JavaRelationshipStrategy - extends RelationshipStrategy, JavaReadOnlyRelationshipStrategy -{ - JavaRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java index b34de68cad..93520fc5aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,11 +22,11 @@ import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 + * @version 3.3 * @since 2.0 */ public interface JavaTable - extends Table, JavaReadOnlyTable + extends Table { BaseTableAnnotation getTableAnnotation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableColumn.java deleted file mode 100644 index 7c0b8625f4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.TableColumn; - -/** - * Java column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.1 - * @since 2.0 - */ -public interface JavaTableColumn - extends TableColumn, JavaReadOnlyTableColumn -{ - //combining interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java deleted file mode 100644 index 7aa5171d01..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTemporalConverter.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.jpa.core.JpaFactory; -import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaElementCollectionTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.JavaTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; - -/** - * Java temporal converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaTemporalConverter - extends JavaBaseTemporalConverter -{ - // ********** adapter ********** - - abstract static class AbstractAdapter - extends JavaConverter.AbstractAdapter - { - - AbstractAdapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseTemporalConverter.class; - } - - @Override - protected String getAnnotationName() { - return TemporalAnnotation.ANNOTATION_NAME; - } - - public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { - return factory.buildJavaBaseTemporalConverter(parent, (TemporalAnnotation) converterAnnotation, this.buildOwner()); - } - } - - public static class BasicAdapter - extends AbstractAdapter - { - private static final Adapter INSTANCE = new BasicAdapter(); - public static Adapter instance() { - return INSTANCE; - } - - private BasicAdapter() { - super(); - } - - @Override - protected Owner buildOwner() { - return new Owner() { - public JptValidator buildValidator(Converter converter) { - return new JavaTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - } - - public static class ElementCollectionAdapter - extends AbstractAdapter - { - private static final Adapter INSTANCE = new ElementCollectionAdapter(); - public static Adapter instance() { - return INSTANCE; - } - - private ElementCollectionAdapter() { - super(); - } - - @Override - protected Owner buildOwner() { - return new Owner() { - public JptValidator buildValidator(Converter converter) { - return new JavaElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaUniqueConstraint.java index 1c0b10f7cb..350c865d98 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaUniqueConstraint.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; * @since 2.0 */ public interface JavaUniqueConstraint - extends UniqueConstraint, JavaReadOnlyUniqueConstraint + extends UniqueConstraint { UniqueConstraintAnnotation getUniqueConstraintAnnotation(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAssociationOverride.java index fd15ebd5b8..98b99964b6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAssociationOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,10 +22,8 @@ import org.eclipse.jpt.jpa.core.context.VirtualAssociationOverride; */ public interface JavaVirtualAssociationOverride extends VirtualAssociationOverride, - JavaVirtualOverride, - JavaReadOnlyAssociationOverride + JavaVirtualOverride { - JavaVirtualOverrideRelationship getRelationship(); JavaAssociationOverride convertToSpecified(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAttributeOverride.java index 3791994e37..1a9461bb76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualAttributeOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,10 +22,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; */ public interface JavaVirtualAttributeOverride extends VirtualAttributeOverride, - JavaVirtualOverride, - JavaReadOnlyAttributeOverride + JavaVirtualOverride { JavaAttributeOverride convertToSpecified(); - - JavaVirtualColumn getColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java deleted file mode 100644 index fa5f1b1f3a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualColumn.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; -import org.eclipse.jpt.jpa.core.context.VirtualColumn; - -/** - * Java virtual column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualColumn - extends VirtualColumn, JavaReadOnlyBaseColumn -{ - /** - * The overridden column can be either a Java join column or an - * <code>orm.xml</code> join column; so we don't change the return type - * here. - */ - ReadOnlyColumn getOverriddenColumn(); - - - // ********** owner ********** - - interface Owner - extends VirtualColumn.Owner, ReadOnlyBaseColumn.Owner - { - /** - * The overridden column can be either a Java column or an - * <code>orm.xml</code> column; so we don't change the return type here. - */ - ReadOnlyColumn resolveOverriddenColumn(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumn.java deleted file mode 100644 index f223e2f187..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumn.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; - -/** - * Java virtual join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinColumn - extends VirtualJoinColumn, JavaReadOnlyJoinColumn -{ - /** - * The overridden join column can be either a Java join column or an - * <code>orm.xml</code> join column; so we don't change the return type - * here. - */ - ReadOnlyJoinColumn getOverriddenColumn(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationship.java deleted file mode 100644 index dfb9d21642..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationship; - -/** - * Java virtual join column relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinColumnRelationship - extends VirtualJoinColumnRelationship, - JavaVirtualRelationship -{ - JavaVirtualJoinColumnRelationshipStrategy getJoinColumnStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationshipStrategy.java deleted file mode 100644 index 2e0262d863..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinColumnRelationshipStrategy.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationshipStrategy; - -/** - * Java virtual join column relationship strategy. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinColumnRelationshipStrategy - extends VirtualJoinColumnRelationshipStrategy, JavaVirtualRelationshipStrategy -{ - ListIterable<JavaVirtualJoinColumn> getJoinColumns(); - ListIterable<JavaVirtualJoinColumn> getSpecifiedJoinColumns(); - JavaVirtualJoinColumn getSpecifiedJoinColumn(int index); - JavaVirtualJoinColumn getDefaultJoinColumn(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTable.java deleted file mode 100644 index a70f5dbbbe..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTable.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; -import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; - -/** - * Java virtual join table - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinTable - extends VirtualJoinTable, JavaReadOnlyTable -{ - JavaVirtualJoinTableRelationshipStrategy getParent(); - - ListIterable<JavaVirtualUniqueConstraint> getUniqueConstraints(); - JavaVirtualUniqueConstraint getUniqueConstraint(int index); - - ListIterable<JavaVirtualJoinColumn> getJoinColumns(); - ListIterable<JavaVirtualJoinColumn> getSpecifiedJoinColumns(); - JavaVirtualJoinColumn getSpecifiedJoinColumn(int index); - JavaVirtualJoinColumn getDefaultJoinColumn(); - - ListIterable<JavaVirtualJoinColumn> getInverseJoinColumns(); - ListIterable<JavaVirtualJoinColumn> getSpecifiedInverseJoinColumns(); - JavaVirtualJoinColumn getSpecifiedInverseJoinColumn(int index); - JavaVirtualJoinColumn getDefaultInverseJoinColumn(); - - /** - * The overridden table can be either a Java table - * or an <code>orm.xml</code> table; so we don't change the - * return type here. - */ - public ReadOnlyJoinTable getOverriddenTable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationship.java deleted file mode 100644 index 5f2963c8b2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationship; - -/** - * Java virtual join table relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinTableRelationship - extends VirtualJoinTableRelationship, - JavaVirtualRelationship -{ - JavaVirtualJoinTableRelationshipStrategy getJoinTableStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationshipStrategy.java deleted file mode 100644 index 7c8ea38e78..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualJoinTableRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; - -/** - * Java virtual join table relationship strategy. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualJoinTableRelationshipStrategy - extends VirtualJoinTableRelationshipStrategy, JavaVirtualRelationshipStrategy -{ - JavaVirtualJoinTable getJoinTable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverride.java index c8427e4766..cd548bba43 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualOverride; * will almost certainly be broken (repeatedly) as the API evolves. */ public interface JavaVirtualOverride - extends VirtualOverride, JavaReadOnlyOverride + extends VirtualOverride { JavaOverride convertToSpecified(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverrideRelationship.java deleted file mode 100644 index 5a63e37edc..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualOverrideRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; - -/** - * Java virtual association override relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualOverrideRelationship - extends VirtualOverrideRelationship, - JavaVirtualJoinColumnRelationship -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationship.java deleted file mode 100644 index fb03325c31..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationship.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualRelationship; - -/** - * Java virtual relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualRelationship - extends VirtualRelationship, JavaReadOnlyRelationship -{ - JavaVirtualRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationshipStrategy.java deleted file mode 100644 index 850754310e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.VirtualRelationshipStrategy; - -/** - * Java virtual strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualRelationshipStrategy - extends VirtualRelationshipStrategy, JavaReadOnlyRelationshipStrategy -{ - JavaVirtualRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualUniqueConstraint.java deleted file mode 100644 index e3429579fb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaVirtualUniqueConstraint.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.java; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; -import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; - -/** - * Java virtual database unique constraint - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualUniqueConstraint - extends VirtualUniqueConstraint, JavaReadOnlyUniqueConstraint -{ - /** - * The overridden unique constraint can be either a Java unique constraint - * or an <code>orm.xml</code> unique constraint; so we don't change the - * return type here. - */ - ReadOnlyUniqueConstraint getOverriddenUniqueConstraint(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverride.java index f3ee4a768b..b3b3d26051 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmAssociationOverride - extends OrmReadOnlyAssociationOverride, AssociationOverride, OrmOverride + extends AssociationOverride, OrmOverride { OrmVirtualAssociationOverride convertToVirtual(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java index 8241f04350..5c0bc64a86 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,15 +25,13 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmAssociationOverrideContainer extends AssociationOverrideContainer, OrmOverrideContainer { // covariant overrides - ListIterable<OrmReadOnlyAssociationOverride> getOverrides(); - OrmReadOnlyAssociationOverride getOverrideNamed(String name); ListIterable<OrmAssociationOverride> getSpecifiedOverrides(); OrmAssociationOverride getSpecifiedOverride(int index); OrmAssociationOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverride.java index b42c1826ce..7eeec066da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmAttributeOverride - extends OrmReadOnlyAttributeOverride, AttributeOverride, OrmOverride + extends AttributeOverride, OrmOverride { OrmVirtualAttributeOverride convertToVirtual(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java index cd0d995573..509b250bce 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmAttributeOverrideContainer @@ -34,8 +34,6 @@ public interface OrmAttributeOverrideContainer void initializeFrom(OrmAttributeOverrideContainer oldContainer); // covariant overrides - ListIterable<OrmReadOnlyAttributeOverride> getOverrides(); - OrmReadOnlyAttributeOverride getOverrideNamed(String name); ListIterable<OrmAttributeOverride> getSpecifiedOverrides(); OrmAttributeOverride getSpecifiedOverride(int index); OrmAttributeOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseColumn.java index be168e0445..7288660556 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface OrmBaseColumn - extends BaseColumn, OrmNamedColumn, OrmReadOnlyBaseColumn + extends BaseColumn, OrmNamedColumn { XmlBaseColumn getXmlColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java index dfc91de0c9..82a308a213 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseEnumeratedConverter.java @@ -11,7 +11,12 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.Converter; +import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.resource.orm.EnumType; +import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; +import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0; /** * <code>orm.xml</code> enumerated/map key enumerated converter @@ -39,4 +44,113 @@ public interface OrmBaseEnumeratedConverter TextRange getEnumTextRange(); } + + // ********** enumerated adapter ********** + + public static class BasicAdapter + implements OrmConverter.Adapter + { + private static final BasicAdapter INSTANCE = new BasicAdapter(); + public static BasicAdapter instance() { + return INSTANCE; + } + + private BasicAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseEnumeratedConverter.class; + } + + public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + XmlConvertibleMapping xmlMapping = (XmlConvertibleMapping) parent.getXmlAttributeMapping(); + return (xmlMapping.getEnumerated() == null) ? null : factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner(xmlMapping)); + } + + protected OrmBaseEnumeratedConverter.Owner buildOwner(final XmlConvertibleMapping mapping) { + return new OrmBaseEnumeratedConverter.Owner() { + public void setXmlEnumType(EnumType enumType) { + mapping.setEnumerated(enumType); + } + public EnumType getXmlEnumType() { + return mapping.getEnumerated(); + } + public TextRange getEnumTextRange() { + return mapping.getEnumeratedTextRange(); + } + public JptValidator buildValidator(Converter converter) { + return JptValidator.Null.instance(); + } + }; + } + + public boolean isActive(XmlAttributeMapping xmlMapping) { + return ((XmlConvertibleMapping) xmlMapping).getEnumerated() != null; + } + + public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + return factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner((XmlConvertibleMapping) parent.getXmlAttributeMapping())); + } + + public void clearXmlValue(XmlAttributeMapping xmlMapping) { + ((XmlConvertibleMapping) xmlMapping).setEnumerated(null); + } + } + + // ********** map key enumerated adapter ********** + + public static class MapKeyAdapter + implements OrmConverter.Adapter + { + private static final MapKeyAdapter INSTANCE = new MapKeyAdapter(); + public static MapKeyAdapter instance() { + return INSTANCE; + } + + private MapKeyAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseEnumeratedConverter.class; + } + + public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + XmlMapKeyConvertibleMapping_2_0 xmlMapping = (XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping(); + return (xmlMapping.getMapKeyEnumerated() == null) ? null : factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner(xmlMapping)); + } + + protected OrmBaseEnumeratedConverter.Owner buildOwner(final XmlMapKeyConvertibleMapping_2_0 mapping) { + return new OrmBaseEnumeratedConverter.Owner() { + public void setXmlEnumType(EnumType enumType) { + mapping.setMapKeyEnumerated(enumType); + } + + public EnumType getXmlEnumType() { + return mapping.getMapKeyEnumerated(); + } + + public TextRange getEnumTextRange() { + return mapping.getMapKeyEnumeratedTextRange(); + } + + public JptValidator buildValidator(Converter converter) { + return JptValidator.Null.instance(); + } + }; + } + + public boolean isActive(XmlAttributeMapping xmlMapping) { + return ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).getMapKeyEnumerated() != null; + } + + public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + return factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner((XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping())); + } + + public void clearXmlValue(XmlAttributeMapping xmlMapping) { + ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).setMapKeyEnumerated(null); + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseJoinColumn.java index 975c621acc..a24f033400 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseJoinColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface OrmBaseJoinColumn - extends BaseJoinColumn, OrmNamedColumn, OrmReadOnlyBaseJoinColumn + extends BaseJoinColumn, OrmNamedColumn { XmlBaseJoinColumn getXmlColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java index 483de64253..7432ec1005 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmBaseTemporalConverter.java @@ -11,7 +11,15 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; +import org.eclipse.jpt.jpa.core.context.Converter; +import org.eclipse.jpt.jpa.core.internal.context.JptValidator; +import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmElementCollectionTemporalConverterValidator; +import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmMapKeyTemporalConverterValidator; +import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmTemporalConverterValidator; import org.eclipse.jpt.jpa.core.resource.orm.TemporalType; +import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; +import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0; /** * <code>orm.xml</code> temporal/map key temporal converter @@ -39,4 +47,156 @@ public interface OrmBaseTemporalConverter TextRange getTemporalTextRange(); } + + // ********** adapter ********** + + abstract static class AbstractAdapter + implements OrmConverter.Adapter + { + AbstractAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseTemporalConverter.class; + } + + public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + XmlConvertibleMapping xmlMapping = (XmlConvertibleMapping) parent.getXmlAttributeMapping(); + return (xmlMapping.getTemporal() == null) ? null : factory.buildOrmBaseTemporalConverter(parent, this.buildOwner(xmlMapping)); + } + + protected abstract OrmBaseTemporalConverter.Owner buildOwner(final XmlConvertibleMapping mapping); + + + public boolean isActive(XmlAttributeMapping xmlMapping) { + return ((XmlConvertibleMapping) xmlMapping).getTemporal() != null; + } + + public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + return factory.buildOrmBaseTemporalConverter(parent, this.buildOwner((XmlConvertibleMapping) parent.getXmlAttributeMapping())); + } + + public void clearXmlValue(XmlAttributeMapping xmlMapping) { + ((XmlConvertibleMapping) xmlMapping).setTemporal(null); + } + } + + public static class BasicAdapter + extends AbstractAdapter + { + private static final Adapter INSTANCE = new BasicAdapter(); + public static Adapter instance() { + return INSTANCE; + } + + private BasicAdapter() { + super(); + } + + @Override + protected Owner buildOwner(final XmlConvertibleMapping mapping) { + return new OrmBaseTemporalConverter.Owner() { + public void setXmlTemporalType(TemporalType temporalType) { + mapping.setTemporal(temporalType); + } + public TemporalType getXmlTemporalType() { + return mapping.getTemporal(); + } + public TextRange getTemporalTextRange() { + return mapping.getTemporalTextRange(); + } + public JptValidator buildValidator(Converter converter) { + return new OrmTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + } + + public static class ElementCollectionAdapter + extends AbstractAdapter + { + private static final Adapter INSTANCE = new ElementCollectionAdapter(); + public static Adapter instance() { + return INSTANCE; + } + + private ElementCollectionAdapter() { + super(); + } + + @Override + protected Owner buildOwner(final XmlConvertibleMapping mapping) { + return new OrmBaseTemporalConverter.Owner() { + public void setXmlTemporalType(TemporalType temporalType) { + mapping.setTemporal(temporalType); + } + public TemporalType getXmlTemporalType() { + return mapping.getTemporal(); + } + public TextRange getTemporalTextRange() { + return mapping.getTemporalTextRange(); + } + public JptValidator buildValidator(Converter converter) { + return new OrmElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + } + + // ********** map key temporal adapter ********** + + public static class MapKeyAdapter + implements OrmConverter.Adapter + { + private static final MapKeyAdapter INSTANCE = new MapKeyAdapter(); + public static MapKeyAdapter instance() { + return INSTANCE; + } + + private MapKeyAdapter() { + super(); + } + + public Class<? extends Converter> getConverterType() { + return BaseTemporalConverter.class; + } + + public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + XmlMapKeyConvertibleMapping_2_0 xmlMapping = (XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping(); + return (xmlMapping.getMapKeyTemporal() == null) ? null : factory.buildOrmBaseTemporalConverter(parent, this.buildOwner(xmlMapping)); + } + + protected OrmBaseTemporalConverter.Owner buildOwner(final XmlMapKeyConvertibleMapping_2_0 mapping) { + return new OrmBaseTemporalConverter.Owner() { + public void setXmlTemporalType(TemporalType temporalType) { + mapping.setMapKeyTemporal(temporalType); + } + + public TemporalType getXmlTemporalType() { + return mapping.getMapKeyTemporal(); + } + + public TextRange getTemporalTextRange() { + return mapping.getMapKeyTemporalTextRange(); + } + + public JptValidator buildValidator(Converter converter) { + return new OrmMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); + } + }; + } + + public boolean isActive(XmlAttributeMapping xmlMapping) { + return ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).getMapKeyTemporal() != null; + } + + public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { + return factory.buildOrmBaseTemporalConverter(parent, this.buildOwner((XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping())); + } + + public void clearXmlValue(XmlAttributeMapping xmlMapping) { + ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).setMapKeyTemporal(null); + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmCollectionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmCollectionMapping.java deleted file mode 100644 index aae5833bcf..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmCollectionMapping.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.CollectionMapping; - -/** - * JPA <code>orm.xml</code> collection mapping (e.g. 1:m, m:m, element collection) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmCollectionMapping - extends CollectionMapping, OrmAttributeMapping -{ - OrmOrderable getOrderable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDbGenerator.java deleted file mode 100644 index 73ca875594..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDbGenerator.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.DbGenerator; - -/** - * <code>orm.xml</code> sequence and table generators - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 3.3 - */ -public interface OrmDbGenerator - extends OrmGenerator, DbGenerator -{ -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java index 30ee19a5f0..919ca14c1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmDiscriminatorColumn.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlDiscriminatorColumn; * @since 2.0 */ public interface OrmDiscriminatorColumn - extends DiscriminatorColumn, OrmNamedDiscriminatorColumn + extends DiscriminatorColumn, OrmNamedColumn { XmlDiscriminatorColumn getXmlColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java deleted file mode 100644 index d0e16364ad..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEnumeratedConverter.java +++ /dev/null @@ -1,84 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.resource.orm.EnumType; -import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; - -/** - * <code>orm.xml</code> enumerated converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmEnumeratedConverter - extends OrmBaseEnumeratedConverter -{ - // ********** adapter ********** - - public static class Adapter - implements OrmConverter.Adapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseEnumeratedConverter.class; - } - - public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - XmlConvertibleMapping xmlMapping = (XmlConvertibleMapping) parent.getXmlAttributeMapping(); - return (xmlMapping.getEnumerated() == null) ? null : factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner(xmlMapping)); - } - - protected OrmBaseEnumeratedConverter.Owner buildOwner(final XmlConvertibleMapping mapping) { - return new OrmBaseEnumeratedConverter.Owner() { - public void setXmlEnumType(EnumType enumType) { - mapping.setEnumerated(enumType); - } - public EnumType getXmlEnumType() { - return mapping.getEnumerated(); - } - public TextRange getEnumTextRange() { - return mapping.getEnumeratedTextRange(); - } - public JptValidator buildValidator(Converter converter) { - return JptValidator.Null.instance(); - } - }; - } - - public boolean isActive(XmlAttributeMapping xmlMapping) { - return ((XmlConvertibleMapping) xmlMapping).getEnumerated() != null; - } - - public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - return factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner((XmlConvertibleMapping) parent.getXmlAttributeMapping())); - } - - public void clearXmlValue(XmlAttributeMapping xmlMapping) { - ((XmlConvertibleMapping) xmlMapping).setEnumerated(null); - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumn.java index b2c7f54120..9688f31451 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmJoinColumn - extends JoinColumn, OrmReadOnlyJoinColumn, OrmBaseJoinColumn, OrmBaseColumn + extends JoinColumn, OrmBaseJoinColumn, OrmBaseColumn { XmlJoinColumn getXmlColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationship.java index e99324dbd7..1181c48a6b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,11 +22,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumnContainer; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmJoinColumnRelationship - extends JoinColumnRelationship, OrmRelationship + extends JoinColumnRelationship { XmlJoinColumnContainer getXmlContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java index d6af886c1b..01ff419caa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.JoinColumnRelationshipStrategy; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmJoinColumnRelationshipStrategy - extends JoinColumnRelationshipStrategy, OrmRelationshipStrategy + extends JoinColumnRelationshipStrategy { ListIterable<OrmJoinColumn> getJoinColumns(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationship.java index 8d15df3467..00112f7024 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTableContainer; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmJoinTableRelationship - extends JoinTableRelationship, OrmRelationship + extends JoinTableRelationship { XmlJoinTableContainer getXmlContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationshipStrategy.java index f35384d08e..1f3496c7b8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTableRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmJoinTableRelationshipStrategy - extends JoinTableRelationshipStrategy, OrmRelationshipStrategy + extends JoinTableRelationshipStrategy { OrmJoinTable getJoinTable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationship.java index 2ac19206a8..8dab9a9649 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,13 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlMappedByMapping; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmMappedByRelationship - extends MappedByRelationship, OrmRelationship + extends MappedByRelationship { XmlMappedByMapping getXmlContainer(); - - OrmMappedByRelationshipStrategy getMappedByStrategy(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationshipStrategy.java deleted file mode 100644 index cc250f2d6c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappedByRelationshipStrategy.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; - -/** - * <code>orm.xml</code> "mapped by" relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.2 - * @since 2.2 - */ -public interface OrmMappedByRelationshipStrategy - extends OrmRelationshipStrategy, MappedByRelationshipStrategy -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappingRelationship.java index d366671163..9b1f1d0753 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappingRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMappingRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.MappingRelationship; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.2 */ public interface OrmMappingRelationship - extends MappingRelationship, OrmRelationship + extends MappingRelationship { OrmRelationshipMapping getMapping(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMultiRelationshipMapping.java index f7b62096f1..a3a91ec56a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmMultiRelationshipMapping.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlMultiRelationshipMapping * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmMultiRelationshipMapping - extends MultiRelationshipMapping, OrmRelationshipMapping, OrmCollectionMapping + extends MultiRelationshipMapping, OrmRelationshipMapping { AbstractXmlMultiRelationshipMapping getXmlAttributeMapping(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedColumn.java index db034bcc01..85e002f7ef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -27,11 +27,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlNamedColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.0 */ public interface OrmNamedColumn - extends NamedColumn, OrmReadOnlyNamedColumn + extends NamedColumn { XmlNamedColumn getXmlColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedDiscriminatorColumn.java deleted file mode 100644 index d20bc2cf6b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmNamedDiscriminatorColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.NamedDiscriminatorColumn; - -/** - * Orm base discriminator column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.1 - * @since 3.1 - */ -public interface OrmNamedDiscriminatorColumn - extends NamedDiscriminatorColumn, OrmNamedColumn -{ - //combining interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOrderable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOrderable.java deleted file mode 100644 index 900b372a7a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOrderable.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.Orderable; - -/** - * Multi-valued (1:m, m:m) relationship mappings support ordering. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface OrmOrderable - extends Orderable -{ - OrmAttributeMapping getParent(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverride.java index bd14dd1ee4..841e2c4a33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOverride; * will almost certainly be broken (repeatedly) as the API evolves. */ public interface OrmOverride - extends Override_, OrmReadOnlyOverride + extends Override_ { XmlOverride getXmlOverride(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java index 1e26d55517..fb13329f3d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java @@ -32,8 +32,6 @@ public interface OrmOverrideContainer extends OverrideContainer { // covariant overrides - ListIterable<? extends OrmReadOnlyOverride> getOverrides(); - OrmReadOnlyOverride getOverrideNamed(String name); ListIterable<? extends OrmOverride> getSpecifiedOverrides(); OrmOverride getSpecifiedOverride(int index); OrmOverride getSpecifiedOverrideNamed(String name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java index a6aef3afef..cb50c1144c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumnRelationshipStrategy * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public interface OrmPrimaryKeyJoinColumnRelationshipStrategy - extends OrmRelationshipStrategy, PrimaryKeyJoinColumnRelationshipStrategy + extends PrimaryKeyJoinColumnRelationshipStrategy { ListIterable<OrmPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns(); OrmPrimaryKeyJoinColumn getPrimaryKeyJoinColumn(int index); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAssociationOverride.java deleted file mode 100644 index 0d680ecc39..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAssociationOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; - -/** - * <code>orm.xml</code> association override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyAssociationOverride - extends ReadOnlyAssociationOverride, OrmReadOnlyOverride -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAttributeOverride.java deleted file mode 100644 index 2e446c2455..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyAttributeOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; - -/** - * Read-only <code>orm.xml</code> attribute override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyAttributeOverride - extends ReadOnlyAttributeOverride, OrmReadOnlyOverride -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java deleted file mode 100644 index b3710cb5e2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; - -/** - * <code>orm.xml</code> read-only column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyBaseColumn - extends ReadOnlyBaseColumn, OrmReadOnlyTableColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java deleted file mode 100644 index 60cce206d9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyBaseJoinColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; - -/** - * <code>orm.xml</code> read-only join column or primary key join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyBaseJoinColumn - extends ReadOnlyBaseJoinColumn, OrmReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java deleted file mode 100644 index 3fe6158835..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyJoinColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; - -/** - * <code>orm.xml</code> read-only join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.0 - */ -public interface OrmReadOnlyJoinColumn - extends ReadOnlyJoinColumn, OrmReadOnlyBaseJoinColumn, OrmReadOnlyBaseColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java deleted file mode 100644 index d208ffd46a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedColumn.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; - -/** - * <code>orm.xml</code> read-only - * <ul> - * <li>column - * <li>join column - * <li>primary key join column - * <li>discriminator column - * <li>order column - * </ul> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyNamedColumn - extends ReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java deleted file mode 100644 index fd31237410..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyNamedDiscriminatorColumn.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; - - -/** - * Orm named discriminator column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 3.1 - */ -public interface OrmReadOnlyNamedDiscriminatorColumn - extends ReadOnlyNamedDiscriminatorColumn, OrmReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java deleted file mode 100644 index f576740493..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyOverride.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; - -/** - * Read-only <code>orm.xml</code> override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyOverride - extends ReadOnlyOverride -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationship.java deleted file mode 100644 index 760a7eb9d7..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationship.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; - -/** - * <code>orm.xml</code> relationship (join column, join table, mapped by, - * primary key join column, mapping) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.2 - */ -public interface OrmReadOnlyRelationship - extends ReadOnlyRelationship -{ - OrmReadOnlyRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationshipStrategy.java deleted file mode 100644 index e1f6be68f6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; - -/** - * <code>orm.xml</code> read-only relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyRelationshipStrategy - extends ReadOnlyRelationshipStrategy -{ - OrmReadOnlyRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java deleted file mode 100644 index 4438fd5295..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTable.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; - -/** - * <code>orm.xml</code> read-only table - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyTable - extends ReadOnlyTable -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java deleted file mode 100644 index 7ffb482617..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyTableColumn.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; - -/** - * <code>orm.xml</code> read-only column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmReadOnlyTableColumn - extends ReadOnlyTableColumn, OrmReadOnlyNamedColumn -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyUniqueConstraint.java deleted file mode 100644 index 451a652218..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReadOnlyUniqueConstraint.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; - -/** - * <code>orm.xml</code> read-only unique constraint - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.0 - */ -public interface OrmReadOnlyUniqueConstraint - extends ReadOnlyUniqueConstraint -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationship.java deleted file mode 100644 index 416a61364b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationship.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.Relationship; - -/** - * <code>orm.xml</code> relationship (join column, join table, mapped by, - * primary key join column, mapping) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.2 - */ -public interface OrmRelationship - extends Relationship, OrmReadOnlyRelationship -{ - OrmRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationshipStrategy.java deleted file mode 100644 index 7704ca4aa4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmRelationshipStrategy.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; - -/** - * <code>orm.xml</code> relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.2 - * @since 2.2 - */ -public interface OrmRelationshipStrategy - extends RelationshipStrategy, OrmReadOnlyRelationshipStrategy -{ - OrmRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSequenceGenerator.java index 501945534e..1580660466 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSequenceGenerator.java @@ -22,11 +22,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlSequenceGenerator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.0 */ public interface OrmSequenceGenerator - extends SequenceGenerator, OrmDbGenerator + extends SequenceGenerator, OrmGenerator { XmlSequenceGenerator getXmlGenerator(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java index 89e5d98697..24953211a0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.Table; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.2 + * @version 3.3 * @since 2.0 */ public interface OrmTable - extends Table, OrmReadOnlyTable + extends Table { ListIterable<OrmUniqueConstraint> getUniqueConstraints(); OrmUniqueConstraint getUniqueConstraint(int index); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableColumn.java deleted file mode 100644 index 503cb8da4f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableColumn.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.TableColumn; - -/** - * <code>orm.xml</code> column or join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.1 - * @since 2.0 - */ -public interface OrmTableColumn - extends TableColumn, OrmReadOnlyTableColumn -{ - //combining interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableGenerator.java index 329a722192..9f2e317d4d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTableGenerator.java @@ -22,11 +22,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlTableGenerator; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 3.3 * @since 2.0 */ public interface OrmTableGenerator - extends TableGenerator, OrmDbGenerator + extends TableGenerator, OrmGenerator { XmlTableGenerator getXmlGenerator(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java deleted file mode 100644 index b851bfe044..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTemporalConverter.java +++ /dev/null @@ -1,129 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmElementCollectionTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.resource.orm.TemporalType; -import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.orm.XmlConvertibleMapping; - -/** - * <code>orm.xml</code> temporal converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmTemporalConverter - extends OrmBaseTemporalConverter -{ - // ********** adapter ********** - - abstract static class AbstractAdapter - implements OrmConverter.Adapter - { - AbstractAdapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseTemporalConverter.class; - } - - public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - XmlConvertibleMapping xmlMapping = (XmlConvertibleMapping) parent.getXmlAttributeMapping(); - return (xmlMapping.getTemporal() == null) ? null : factory.buildOrmBaseTemporalConverter(parent, this.buildOwner(xmlMapping)); - } - - protected abstract OrmTemporalConverter.Owner buildOwner(final XmlConvertibleMapping mapping); - - - public boolean isActive(XmlAttributeMapping xmlMapping) { - return ((XmlConvertibleMapping) xmlMapping).getTemporal() != null; - } - - public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - return factory.buildOrmBaseTemporalConverter(parent, this.buildOwner((XmlConvertibleMapping) parent.getXmlAttributeMapping())); - } - - public void clearXmlValue(XmlAttributeMapping xmlMapping) { - ((XmlConvertibleMapping) xmlMapping).setTemporal(null); - } - } - - public static class BasicAdapter - extends AbstractAdapter - { - private static final Adapter INSTANCE = new BasicAdapter(); - public static Adapter instance() { - return INSTANCE; - } - - private BasicAdapter() { - super(); - } - - @Override - protected Owner buildOwner(final XmlConvertibleMapping mapping) { - return new OrmBaseTemporalConverter.Owner() { - public void setXmlTemporalType(TemporalType temporalType) { - mapping.setTemporal(temporalType); - } - public TemporalType getXmlTemporalType() { - return mapping.getTemporal(); - } - public TextRange getTemporalTextRange() { - return mapping.getTemporalTextRange(); - } - public JptValidator buildValidator(Converter converter) { - return new OrmTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - } - - public static class ElementCollectionAdapter - extends AbstractAdapter - { - private static final Adapter INSTANCE = new ElementCollectionAdapter(); - public static Adapter instance() { - return INSTANCE; - } - - private ElementCollectionAdapter() { - super(); - } - - @Override - protected Owner buildOwner(final XmlConvertibleMapping mapping) { - return new OrmBaseTemporalConverter.Owner() { - public void setXmlTemporalType(TemporalType temporalType) { - mapping.setTemporal(temporalType); - } - public TemporalType getXmlTemporalType() { - return mapping.getTemporal(); - } - public TextRange getTemporalTextRange() { - return mapping.getTemporalTextRange(); - } - public JptValidator buildValidator(Converter converter) { - return new OrmElementCollectionTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmUniqueConstraint.java index a71e6b033f..f9aaba9173 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmUniqueConstraint.java @@ -22,11 +22,11 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlUniqueConstraint; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.1 + * @version 3.3 * @since 2.0 */ public interface OrmUniqueConstraint - extends UniqueConstraint, OrmReadOnlyUniqueConstraint + extends UniqueConstraint { XmlUniqueConstraint getXmlUniqueConstraint(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAssociationOverride.java index 4023c5ab17..0ef4201769 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAssociationOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -22,10 +22,8 @@ import org.eclipse.jpt.jpa.core.context.VirtualAssociationOverride; */ public interface OrmVirtualAssociationOverride extends VirtualAssociationOverride, - OrmVirtualOverride, - OrmReadOnlyAssociationOverride + OrmVirtualOverride { - OrmVirtualOverrideRelationship getRelationship(); OrmAssociationOverride convertToSpecified(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAttributeOverride.java index 407053f9cd..98704b0ede 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualAttributeOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; /** * Java <em>virtual</em> attribute override @@ -22,10 +23,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualAttributeOverride; */ public interface OrmVirtualAttributeOverride extends VirtualAttributeOverride, - OrmVirtualOverride, - OrmReadOnlyAttributeOverride + OrmVirtualOverride { OrmAttributeOverride convertToSpecified(); - - OrmVirtualColumn getColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java deleted file mode 100644 index 77ab5fd7ac..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualColumn.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; -import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; -import org.eclipse.jpt.jpa.core.context.VirtualColumn; - -/** - * <code>orm.xml</code> virtual column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualColumn - extends VirtualColumn, OrmReadOnlyBaseColumn -{ - /** - * The overridden column can be either a Java join column or an - * <code>orm.xml</code> join column; so we don't change the return type - * here. - */ - ReadOnlyColumn getOverriddenColumn(); - - - // ********** owner ********** - - interface Owner - extends VirtualColumn.Owner, ReadOnlyBaseColumn.Owner - { - /** - * The overridden column can be either a Java column or an - * <code>orm.xml</code> column; so we don't change the return type here. - */ - ReadOnlyColumn resolveOverriddenColumn(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumn.java deleted file mode 100644 index 3c6f174550..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumn.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; - -/** - * <code>orm.xml</code> virtual join column - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinColumn - extends VirtualJoinColumn, OrmReadOnlyJoinColumn -{ - /** - * The overridden join column can be either a Java join column or an - * <code>orm.xml</code> join column; so we don't change the return type - * here. - */ - ReadOnlyJoinColumn getOverriddenColumn(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationship.java deleted file mode 100644 index d2d4154496..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationship; - -/** - * <code>orm.xml</code> virtual join column relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinColumnRelationship - extends VirtualJoinColumnRelationship, - OrmVirtualRelationship -{ - OrmVirtualJoinColumnRelationshipStrategy getJoinColumnStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationshipStrategy.java deleted file mode 100644 index f938095e33..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinColumnRelationshipStrategy.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationshipStrategy; - -/** - * <code>orm.xml</code> virtual join column relationship strategy. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinColumnRelationshipStrategy - extends VirtualJoinColumnRelationshipStrategy, OrmVirtualRelationshipStrategy -{ - ListIterable<OrmVirtualJoinColumn> getJoinColumns(); - ListIterable<OrmVirtualJoinColumn> getSpecifiedJoinColumns(); - OrmVirtualJoinColumn getSpecifiedJoinColumn(int index); - OrmVirtualJoinColumn getDefaultJoinColumn(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTable.java deleted file mode 100644 index 2a200360fb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTable.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; -import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; - -/** - * <code>orm.xml</code> virtual join table - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinTable - extends VirtualJoinTable, OrmReadOnlyTable -{ - OrmVirtualJoinTableRelationshipStrategy getParent(); - - ListIterable<OrmVirtualUniqueConstraint> getUniqueConstraints(); - OrmVirtualUniqueConstraint getUniqueConstraint(int index); - - ListIterable<OrmVirtualJoinColumn> getJoinColumns(); - ListIterable<OrmVirtualJoinColumn> getSpecifiedJoinColumns(); - OrmVirtualJoinColumn getSpecifiedJoinColumn(int index); - OrmVirtualJoinColumn getDefaultJoinColumn(); - - ListIterable<OrmVirtualJoinColumn> getInverseJoinColumns(); - ListIterable<OrmVirtualJoinColumn> getSpecifiedInverseJoinColumns(); - OrmVirtualJoinColumn getSpecifiedInverseJoinColumn(int index); - OrmVirtualJoinColumn getDefaultInverseJoinColumn(); - - /** - * The overridden table can be either a Java table - * or an <code>orm.xml</code> table; so we don't change the - * return type here. - */ - public ReadOnlyJoinTable getOverriddenTable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationship.java deleted file mode 100644 index b5b58c4bfc..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationship; - -/** - * <code>orm.xml</code> virtual join table relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinTableRelationship - extends VirtualJoinTableRelationship, - OrmVirtualRelationship -{ - OrmVirtualJoinTableRelationshipStrategy getJoinTableStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationshipStrategy.java deleted file mode 100644 index 2072e72dd5..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualJoinTableRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; - -/** - * <code>orm.xml</code> virtual join table relationship strategy. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualJoinTableRelationshipStrategy - extends VirtualJoinTableRelationshipStrategy, OrmVirtualRelationshipStrategy -{ - OrmVirtualJoinTable getJoinTable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverride.java index 92abbba1d7..d4802c5bb4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverride.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.VirtualOverride; * will almost certainly be broken (repeatedly) as the API evolves. */ public interface OrmVirtualOverride - extends VirtualOverride, OrmReadOnlyOverride + extends VirtualOverride { OrmOverride convertToSpecified(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverrideRelationship.java deleted file mode 100644 index aae36353b0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualOverrideRelationship.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; - -/** - * <code>orm.xml</code> virtual association override relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualOverrideRelationship - extends VirtualOverrideRelationship, - OrmVirtualJoinColumnRelationship -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualPrimaryKeyJoinColumn.java index 77388244a9..1f69466951 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualPrimaryKeyJoinColumn.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; * will almost certainly be broken (repeatedly) as the API evolves. */ public interface OrmVirtualPrimaryKeyJoinColumn - extends VirtualPrimaryKeyJoinColumn, OrmReadOnlyBaseJoinColumn + extends VirtualPrimaryKeyJoinColumn { /** * This is not the best method name; we are simply overloading the meaning diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationship.java deleted file mode 100644 index 7738e2e999..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationship.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualRelationship; - -/** - * <code>orm.xml</code> virtual relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualRelationship - extends VirtualRelationship, OrmReadOnlyRelationship -{ - OrmVirtualRelationshipStrategy getStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationshipStrategy.java deleted file mode 100644 index 08c209b2c3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualRelationshipStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.VirtualRelationshipStrategy; - -/** - * <code>orm.xml</code> virtual strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualRelationshipStrategy - extends VirtualRelationshipStrategy, OrmReadOnlyRelationshipStrategy -{ - OrmVirtualRelationship getRelationship(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java index 937913dd5b..2e9cdd5081 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; * will almost certainly be broken (repeatedly) as the API evolves. */ public interface OrmVirtualSecondaryTable - extends VirtualSecondaryTable, OrmReadOnlyTable + extends VirtualSecondaryTable { ListIterable<OrmVirtualPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns(); ListIterable<OrmVirtualPrimaryKeyJoinColumn> getSpecifiedPrimaryKeyJoinColumns(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualUniqueConstraint.java deleted file mode 100644 index 2e2c1ad703..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualUniqueConstraint.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.context.orm; - -import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; -import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; - -/** - * <code>orm.xml</code> virtual database unique constraint - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualUniqueConstraint - extends VirtualUniqueConstraint, OrmReadOnlyUniqueConstraint -{ - /** - * The overridden unique constraint can be either a Java unique constraint - * or an <code>orm.xml</code> unique constraint; so we don't change the - * return type here. - */ - ReadOnlyUniqueConstraint getOverriddenUniqueConstraint(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java index 0872974e06..c3773efb21 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmXmlContextNodeFactory.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.context.orm; 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.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; @@ -19,6 +20,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; @@ -122,11 +129,11 @@ public interface OrmXmlContextNodeFactory OrmJoinTable buildOrmJoinTable(OrmJoinTableRelationshipStrategy parent, Table.Owner owner); - OrmVirtualJoinTable buildOrmVirtualJoinTable(OrmVirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable); + VirtualJoinTable buildOrmVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable); OrmJoinColumn buildOrmJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, XmlJoinColumn resourceJoinColumn); - OrmVirtualJoinColumn buildOrmVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); + VirtualJoinColumn buildOrmVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn); OrmAttributeOverrideContainer buildOrmAttributeOverrideContainer(JpaContextNode parent, OrmAttributeOverrideContainer.Owner owner); @@ -142,13 +149,13 @@ public interface OrmXmlContextNodeFactory OrmOverrideRelationship buildOrmOverrideRelationship(OrmAssociationOverride parent); - OrmVirtualOverrideRelationship buildOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent); + VirtualOverrideRelationship buildOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent); OrmDiscriminatorColumn buildOrmDiscriminatorColumn(OrmEntity parent, OrmDiscriminatorColumn.Owner owner); OrmColumn buildOrmColumn(JpaContextNode parent, OrmColumn.Owner owner); - OrmVirtualColumn buildOrmVirtualColumn(JpaContextNode parent, OrmVirtualColumn.Owner owner); + VirtualColumn buildOrmVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner); OrmGeneratedValue buildOrmGeneratedValue(JpaContextNode parent, XmlGeneratedValue resourceGeneratedValue); @@ -252,7 +259,7 @@ public interface OrmXmlContextNodeFactory OrmUniqueConstraint buildOrmUniqueConstraint(JpaContextNode parent, UniqueConstraint.Owner owner, XmlUniqueConstraint resourceUniqueConstraint); - OrmVirtualUniqueConstraint buildOrmVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint); + VirtualUniqueConstraint buildOrmVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint); OrmConverter buildOrmBaseEnumeratedConverter(OrmAttributeMapping parent, OrmBaseEnumeratedConverter.Owner owner); @@ -267,5 +274,5 @@ public interface OrmXmlContextNodeFactory * must build objects that implement the appropriate behavior. * @see org.eclipse.jpt.jpa.core.jpa2.context.AttributeMapping2_0 */ - OrmOrderable buildOrmOrderable(OrmAttributeMapping parent); + Orderable buildOrmOrderable(OrmAttributeMapping parent); } 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 25ce28ce8a..621839dc73 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 @@ -22,6 +22,7 @@ import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -31,6 +32,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.Accessor; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; @@ -61,7 +68,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaNamedNativeQuery; 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.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -79,12 +85,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.orm.OrmXml; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXml; @@ -249,7 +249,7 @@ public abstract class AbstractJpaFactory return new GenericJavaColumn(parent, owner); } - public JavaVirtualColumn buildJavaVirtualColumn(JpaContextNode parent, JavaVirtualColumn.Owner owner) { + public VirtualColumn buildJavaVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner) { return new GenericJavaVirtualColumn(parent, owner); } @@ -261,7 +261,7 @@ public abstract class AbstractJpaFactory return new GenericJavaJoinColumn(parent, owner, joinColumnAnnotation); } - public JavaVirtualJoinColumn buildJavaVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public VirtualJoinColumn buildJavaVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { return new GenericJavaVirtualJoinColumn(parent, owner, overriddenColumn); } @@ -269,7 +269,7 @@ public abstract class AbstractJpaFactory return new GenericJavaJoinTable(parent, owner); } - public JavaVirtualJoinTable buildJavaVirtualJoinTable(JavaVirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable) { + public VirtualJoinTable buildJavaVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable) { return new GenericJavaVirtualJoinTable(parent, owner, overriddenTable); } @@ -369,7 +369,7 @@ public abstract class AbstractJpaFactory return new GenericJavaOverrideRelationship(parent); } - public JavaVirtualOverrideRelationship buildJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent) { + public VirtualOverrideRelationship buildJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent) { return new GenericJavaVirtualOverrideRelationship(parent); } @@ -393,7 +393,7 @@ public abstract class AbstractJpaFactory return new GenericJavaUniqueConstraint(parent, owner, constraintAnnotation); } - public JavaVirtualUniqueConstraint buildJavaVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint) { + public VirtualUniqueConstraint buildJavaVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint) { return new GenericJavaVirtualUniqueConstraint(parent, overriddenUniqueConstraint); } @@ -409,7 +409,7 @@ public abstract class AbstractJpaFactory return new GenericJavaLobConverter(parent, annotation, owner); } - public JavaOrderable buildJavaOrderable(JavaAttributeMapping parent) { + public Orderable buildJavaOrderable(JavaAttributeMapping parent) { return new GenericJavaOrderable(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 a458615f16..73fe4b3911 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 @@ -32,7 +32,7 @@ import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; 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.java.JavaPersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -284,7 +284,7 @@ public abstract class AbstractJavaAttributeMapping<A extends Annotation> } public String getMetamodelTypeName() { - return ((JavaPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); + return ((PersistentAttribute2_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/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 5f96d1255e..04a8236db0 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 @@ -21,13 +21,13 @@ import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; 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; @@ -56,8 +56,8 @@ public abstract class AbstractJavaBasicMapping protected static final JavaConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaEnumeratedConverter.Adapter.instance(), - JavaTemporalConverter.BasicAdapter.instance(), + JavaBaseEnumeratedConverter.BasicAdapter.instance(), + JavaBaseTemporalConverter.BasicAdapter.instance(), JavaLobConverter.Adapter.instance() }; protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); 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 4f2dfaff35..dda338b08b 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 @@ -72,7 +72,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaIdClassReference; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaTable; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -1637,7 +1636,7 @@ public abstract class AbstractJavaEntity * some common behavior */ protected abstract class NamedColumnOwner - implements JavaReadOnlyNamedColumn.Owner + implements ReadOnlyNamedColumn.Owner { public String getDefaultTableName() { return AbstractJavaEntity.this.getPrimaryTableName(); 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 f44809d90c..406a2a7746 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 @@ -25,13 +25,13 @@ import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; 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.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; 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; @@ -67,7 +67,7 @@ public abstract class AbstractJavaIdMapping protected static final JavaConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaTemporalConverter.BasicAdapter.instance(), + JavaBaseTemporalConverter.BasicAdapter.instance(), }; protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); 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 22c5d8c9e3..264e9821e7 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,15 +10,16 @@ package org.eclipse.jpt.jpa.core.internal.context.java; 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.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.ManyToManyAnnotation; public abstract class AbstractJavaManyToManyMapping extends AbstractJavaMultiRelationshipMapping<ManyToManyAnnotation> - implements JavaManyToManyMapping2_0 + implements ManyToManyMapping2_0, JavaManyToManyMapping { protected AbstractJavaManyToManyMapping(JavaPersistentAttribute 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 42a93b9b37..4d84663fbc 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,14 +10,15 @@ 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.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.ManyToOneAnnotation; public abstract class AbstractJavaManyToOneMapping extends AbstractJavaSingleRelationshipMapping<ManyToOneAnnotation> - implements JavaManyToOneMapping2_0 + implements ManyToOneMapping2_0, JavaManyToOneMapping { protected AbstractJavaManyToOneMapping(JavaPersistentAttribute parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java index 0da8c8de73..4f27e5aca6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMappingRelationship.java @@ -19,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingRelationshipStrategy2_0; /** * <strong>NB:</strong> Subclasses may want to set the {@link #strategy} at the @@ -30,7 +29,7 @@ public abstract class AbstractJavaMappingRelationship<M extends JavaRelationship extends AbstractJavaJpaContextNode implements JavaMappingRelationship { - protected JavaMappingRelationshipStrategy2_0 strategy; + protected RelationshipStrategy strategy; public AbstractJavaMappingRelationship(M parent) { @@ -49,17 +48,17 @@ public abstract class AbstractJavaMappingRelationship<M extends JavaRelationship // ********** strategy ********** - public JavaMappingRelationshipStrategy2_0 getStrategy() { + public RelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(JavaMappingRelationshipStrategy2_0 strategy) { + protected void setStrategy(RelationshipStrategy strategy) { RelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected abstract JavaMappingRelationshipStrategy2_0 buildStrategy(); + protected abstract RelationshipStrategy buildStrategy(); /** * This is called by subclasses when the various supported strategies are 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 7720c87251..c1fff2a524 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 @@ -33,6 +33,8 @@ import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.JoinColumn; +import org.eclipse.jpt.jpa.core.context.MultiRelationshipMapping; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; @@ -43,13 +45,13 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; 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.JavaBaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaMultiRelationshipMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; 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,11 +66,9 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.NullMapKeyJoinColumn import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_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.context.java.JavaMapKeyEnumeratedConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapKeyTemporalConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation; @@ -83,9 +83,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaMultiRelationshipMapping<A extends RelationshipMappingAnnotation> extends AbstractJavaRelationshipMapping<A> - implements JavaMultiRelationshipMapping, JavaCollectionMapping2_0 + implements MultiRelationshipMapping, JavaRelationshipMapping, JavaCollectionMapping2_0 { - protected final JavaOrderable orderable; + protected final Orderable orderable; protected String specifiedMapKey; protected boolean noMapKey = false; @@ -110,8 +110,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi protected final JavaAttributeOverrideContainer mapKeyAttributeOverrideContainer; protected static final JavaConverter.Adapter[] MAP_KEY_CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaMapKeyEnumeratedConverter2_0.Adapter.instance(), - JavaMapKeyTemporalConverter2_0.Adapter.instance() + JavaBaseEnumeratedConverter.MapKeyAdapter.instance(), + JavaBaseTemporalConverter.MapKeyAdapter.instance() }; protected static final Iterable<JavaConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(MAP_KEY_CONVERTER_ADAPTER_ARRAY); @@ -179,11 +179,11 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi // ********** orderable ********** - public JavaOrderable getOrderable() { + public Orderable getOrderable() { return this.orderable; } - protected JavaOrderable buildOrderable() { + protected Orderable buildOrderable() { return this.isJpa2_0Compatible() ? this.getJpaFactory2_0().buildJavaOrderable(this, this.buildOrderableOwner()) : this.getJpaFactory().buildJavaOrderable(this); @@ -202,7 +202,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi public Table resolveDbTable(String tableName) { return this.getRelationshipStrategy().resolveDbTable(tableName); } - protected JavaRelationshipStrategy getRelationshipStrategy() { + protected RelationshipStrategy getRelationshipStrategy() { return AbstractJavaMultiRelationshipMapping.this.getRelationship().getStrategy(); } } @@ -933,7 +933,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi @Override protected String getMetamodelFieldTypeName() { - return ((JavaPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -943,7 +943,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((JavaPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java index f3c1fa9bf7..dfd73b88d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java @@ -16,7 +16,6 @@ import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaNamedColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.resource.java.NamedColumnAnnotation; import org.eclipse.jpt.jpa.db.Column; @@ -41,7 +40,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; * is initialized * </ul> */ -public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O extends JavaReadOnlyNamedColumn.Owner> +public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O extends ReadOnlyNamedColumn.Owner> extends AbstractJavaJpaContextNode implements JavaNamedColumn { 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 a7614b8d84..57d5052e3a 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,19 +11,20 @@ package org.eclipse.jpt.jpa.core.internal.context.java; 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.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToManyMapping2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; public abstract class AbstractJavaOneToManyMapping extends AbstractJavaMultiRelationshipMapping<OneToManyAnnotation> - implements JavaOneToManyMapping2_0, JavaOrphanRemovalHolder2_0 + implements OneToManyMapping2_0, JavaOneToManyMapping, OrphanRemovalHolder2_0 { - protected final JavaOrphanRemovable2_0 orphanRemoval; + protected final OrphanRemovable2_0 orphanRemoval; protected AbstractJavaOneToManyMapping(JavaPersistentAttribute parent) { @@ -62,11 +63,11 @@ public abstract class AbstractJavaOneToManyMapping // ********** orphan removal ********** - public JavaOrphanRemovable2_0 getOrphanRemoval() { + public OrphanRemovable2_0 getOrphanRemoval() { return this.orphanRemoval; } - protected JavaOrphanRemovable2_0 buildOrphanRemoval() { + protected OrphanRemovable2_0 buildOrphanRemoval() { return this.isJpa2_0Compatible() ? this.getJpaFactory2_0().buildJavaOrphanRemoval(this) : new NullJavaOrphanRemoval2_0(this); 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 1fca5e88aa..46fd9ab9a1 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,20 +10,21 @@ 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.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaOrphanRemoval2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneMapping2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation; public abstract class AbstractJavaOneToOneMapping extends AbstractJavaSingleRelationshipMapping<OneToOneAnnotation> - implements JavaOneToOneMapping2_0, JavaOrphanRemovalHolder2_0 + implements OneToOneMapping2_0, JavaOneToOneMapping, OrphanRemovalHolder2_0 { - protected final JavaOrphanRemovable2_0 orphanRemoval; + protected final OrphanRemovable2_0 orphanRemoval; protected AbstractJavaOneToOneMapping(JavaPersistentAttribute parent) { @@ -62,11 +63,11 @@ public abstract class AbstractJavaOneToOneMapping // ********** orphan removal ********** - public JavaOrphanRemovable2_0 getOrphanRemoval() { + public OrphanRemovable2_0 getOrphanRemoval() { return this.orphanRemoval; } - protected JavaOrphanRemovable2_0 buildOrphanRemoval() { + protected OrphanRemovable2_0 buildOrphanRemoval() { return this.isJpa2_0Compatible() ? this.getJpaFactory2_0().buildJavaOrphanRemoval(this) : new NullJavaOrphanRemoval2_0(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index 673af62c25..5eaabae519 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -37,7 +37,7 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.java.JavaPersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_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; @@ -48,7 +48,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaPersistentAttribute extends AbstractJavaJpaContextNode - implements JavaPersistentAttribute2_0 { + implements JavaPersistentAttribute, PersistentAttribute2_0 { protected final Accessor accessor; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java index da5efb6555..a21c330c1c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java @@ -12,11 +12,11 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.Vector; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; public abstract class AbstractJavaReadOnlyUniqueConstraint extends AbstractJavaJpaContextNode - implements JavaReadOnlyUniqueConstraint + implements ReadOnlyUniqueConstraint { protected final Vector<String> columnNames = new Vector<String>(); 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 dcf43e031d..d3b85d651f 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 @@ -17,13 +17,13 @@ import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaCascade; import org.eclipse.jpt.jpa.core.context.java.JavaMappingRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; @@ -49,7 +49,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp protected final JavaMappingRelationship relationship; - protected final JavaCascade cascade; + protected final Cascade cascade; protected FetchType specifiedFetch; protected FetchType defaultFetch; @@ -167,11 +167,11 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // ********** cascade ********** - public JavaCascade getCascade() { + public Cascade getCascade() { return this.cascade; } - protected JavaCascade buildCascade() { + protected Cascade buildCascade() { // NB: we don't use the platform return new GenericJavaCascade(this); } 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 fefe19d1b9..13a6bc2315 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 @@ -21,10 +21,10 @@ import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; 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; @@ -52,7 +52,7 @@ public abstract class AbstractJavaVersionMapping // the spec does not list Temporal explicitly, // but it is included in the orm.xml schema... protected static final JavaConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaTemporalConverter.BasicAdapter.instance(), + JavaBaseTemporalConverter.BasicAdapter.instance(), }; protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java index d705d0fcc6..b0285a6d16 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualBaseColumn.java @@ -13,11 +13,10 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.VirtualBaseColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyBaseColumn; public abstract class AbstractJavaVirtualBaseColumn<O extends ReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> extends AbstractJavaVirtualNamedColumn<O, C> - implements VirtualBaseColumn, JavaReadOnlyBaseColumn + implements VirtualBaseColumn { protected String specifiedTable; protected String defaultTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java index a046d98dd0..ece6bb8775 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.VirtualNamedColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -32,7 +31,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColumn.Owner, C extends ReadOnlyNamedColumn> extends AbstractJavaJpaContextNode - implements VirtualNamedColumn, JavaReadOnlyNamedColumn + implements VirtualNamedColumn { protected final O owner; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java index 2294961398..693a9f0379 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedDiscriminatorColumn.java @@ -13,11 +13,10 @@ import org.eclipse.jpt.jpa.core.context.DiscriminatorType; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.VirtualNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedDiscriminatorColumn; public abstract class AbstractJavaVirtualNamedDiscriminatorColumn<O extends ReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> extends AbstractJavaVirtualNamedColumn<O, C> - implements VirtualNamedDiscriminatorColumn, JavaReadOnlyNamedDiscriminatorColumn + implements VirtualNamedDiscriminatorColumn { protected Integer specifiedLength; protected int defaultLength; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java index b19cc7ae33..756c69a65b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java @@ -18,8 +18,8 @@ import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; import org.eclipse.jpt.jpa.core.context.VirtualReferenceTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -27,10 +27,10 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere extends AbstractJavaVirtualTable<T> implements VirtualReferenceTable { - protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner joinColumnOwner; - protected JavaVirtualJoinColumn defaultJoinColumn; + protected VirtualJoinColumn defaultJoinColumn; protected AbstractJavaVirtualReferenceTable(JpaContextNode parent, Owner owner, T overridenTable) { @@ -52,7 +52,7 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere // ********** join columns ********** - public ListIterable<JavaVirtualJoinColumn> getJoinColumns() { + public ListIterable<VirtualJoinColumn> getJoinColumns() { return this.hasSpecifiedJoinColumns() ? this.getSpecifiedJoinColumns() : this.getDefaultJoinColumns(); } @@ -63,7 +63,7 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere // ********** specified join columns ********** - public ListIterable<JavaVirtualJoinColumn> getSpecifiedJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedJoinColumns() { return this.specifiedJoinColumnContainer.getContextElements(); } @@ -75,7 +75,7 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere return this.getSpecifiedJoinColumnsSize() != 0; } - public JavaVirtualJoinColumn getSpecifiedJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedJoinColumn(int index) { return this.specifiedJoinColumnContainer.getContextElement(index); } @@ -87,19 +87,19 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere return new SuperListIterableWrapper<ReadOnlyJoinColumn>(this.getOverriddenTable().getSpecifiedJoinColumns()); } - protected void moveSpecifiedJoinColumn(int index, JavaVirtualJoinColumn joinColumn) { + protected void moveSpecifiedJoinColumn(int index, VirtualJoinColumn joinColumn) { this.specifiedJoinColumnContainer.moveContextElement(index, joinColumn); } - protected JavaVirtualJoinColumn addSpecifiedJoinColumn(int index, JoinColumn joinColumn) { + protected VirtualJoinColumn addSpecifiedJoinColumn(int index, JoinColumn joinColumn) { return this.specifiedJoinColumnContainer.addContextElement(index, joinColumn); } - protected void removeSpecifiedJoinColumn(JavaVirtualJoinColumn joinColumn) { + protected void removeSpecifiedJoinColumn(VirtualJoinColumn joinColumn) { this.specifiedJoinColumnContainer.removeContextElement(joinColumn); } - protected ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { return new SpecifiedJoinColumnContainer(); } @@ -107,14 +107,14 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere * specified join column container */ protected class SpecifiedJoinColumnContainer - extends ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_JOIN_COLUMNS_LIST; } @Override - protected JavaVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return AbstractJavaVirtualReferenceTable.this.buildJoinColumn(resourceElement); } @Override @@ -122,7 +122,7 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere return AbstractJavaVirtualReferenceTable.this.getOverriddenJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(JavaVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -130,20 +130,20 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere // ********** default join column ********** - public JavaVirtualJoinColumn getDefaultJoinColumn() { + public VirtualJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(JavaVirtualJoinColumn joinColumn) { - JavaVirtualJoinColumn old = this.defaultJoinColumn; + protected void setDefaultJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultJoinColumn; this.defaultJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_JOIN_COLUMN_PROPERTY, old, joinColumn); } - protected ListIterable<JavaVirtualJoinColumn> getDefaultJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultJoinColumns() { return (this.defaultJoinColumn != null) ? - new SingleElementListIterable<JavaVirtualJoinColumn>(this.defaultJoinColumn) : - EmptyListIterable.<JavaVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultJoinColumnsSize() { @@ -169,11 +169,11 @@ public abstract class AbstractJavaVirtualReferenceTable<T extends ReadOnlyRefere // ********** misc ********** - protected JavaVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn joinColumn) { return this.buildJoinColumn(this.joinColumnOwner, joinColumn); } - protected JavaVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { return this.getJpaFactory().buildJavaVirtualJoinColumn(this, columnOwner, joinColumn); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java index dd536e3000..d466b44c12 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java @@ -18,8 +18,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.VirtualTable; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; @@ -29,7 +28,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> extends AbstractJavaJpaContextNode - implements VirtualTable, JavaReadOnlyTable + implements VirtualTable { protected final Owner owner; @@ -44,7 +43,7 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> protected String specifiedCatalog; protected String defaultCatalog; - protected final ContextListContainer<JavaVirtualUniqueConstraint, ReadOnlyUniqueConstraint> uniqueConstraintContainer; + protected final ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> uniqueConstraintContainer; protected AbstractJavaVirtualTable(JpaContextNode parent, Owner owner, T overridenTable) { @@ -185,7 +184,7 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> // ********** unique constraints ********** - public ListIterable<JavaVirtualUniqueConstraint> getUniqueConstraints() { + public ListIterable<VirtualUniqueConstraint> getUniqueConstraints() { return this.uniqueConstraintContainer.getContextElements(); } @@ -193,7 +192,7 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> return this.uniqueConstraintContainer.getContextElementsSize(); } - public JavaVirtualUniqueConstraint getUniqueConstraint(int index) { + public VirtualUniqueConstraint getUniqueConstraint(int index) { return this.uniqueConstraintContainer.getContextElement(index); } @@ -205,23 +204,23 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> return new SuperListIterableWrapper<ReadOnlyUniqueConstraint>(this.getOverriddenTable().getUniqueConstraints()); } - protected void moveUniqueConstraint(int index, JavaVirtualUniqueConstraint constraint) { + protected void moveUniqueConstraint(int index, VirtualUniqueConstraint constraint) { this.uniqueConstraintContainer.moveContextElement(index, constraint); } - protected JavaVirtualUniqueConstraint addUniqueConstraint(int index, ReadOnlyUniqueConstraint uniqueConstraint) { + protected VirtualUniqueConstraint addUniqueConstraint(int index, ReadOnlyUniqueConstraint uniqueConstraint) { return this.uniqueConstraintContainer.addContextElement(index, uniqueConstraint); } - protected JavaVirtualUniqueConstraint buildUniqueConstraint(ReadOnlyUniqueConstraint uniqueConstraint) { + protected VirtualUniqueConstraint buildUniqueConstraint(ReadOnlyUniqueConstraint uniqueConstraint) { return this.getJpaFactory().buildJavaVirtualUniqueConstraint(this, uniqueConstraint); } - protected void removeUniqueConstraint(JavaVirtualUniqueConstraint constraint) { + protected void removeUniqueConstraint(VirtualUniqueConstraint constraint) { this.uniqueConstraintContainer.removeContextElement(constraint); } - protected ContextListContainer<JavaVirtualUniqueConstraint, ReadOnlyUniqueConstraint> buildUniqueConstraintContainer() { + protected ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> buildUniqueConstraintContainer() { return new UniqueConstraintContainer(); } @@ -229,14 +228,14 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> * unique constraint container */ protected class UniqueConstraintContainer - extends ContextListContainer<JavaVirtualUniqueConstraint, ReadOnlyUniqueConstraint> + extends ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> { @Override protected String getContextElementsPropertyName() { return UNIQUE_CONSTRAINTS_LIST; } @Override - protected JavaVirtualUniqueConstraint buildContextElement(ReadOnlyUniqueConstraint resourceElement) { + protected VirtualUniqueConstraint buildContextElement(ReadOnlyUniqueConstraint resourceElement) { return AbstractJavaVirtualTable.this.buildUniqueConstraint(resourceElement); } @Override @@ -244,7 +243,7 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> return AbstractJavaVirtualTable.this.getOverriddenUniqueConstraints(); } @Override - protected ReadOnlyUniqueConstraint getResourceElement(JavaVirtualUniqueConstraint contextElement) { + protected ReadOnlyUniqueConstraint getResourceElement(VirtualUniqueConstraint contextElement) { return contextElement.getOverriddenUniqueConstraint(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java index a26376385c..fc4e9435d1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToManyRelationship.java @@ -13,17 +13,15 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; 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.JavaMappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaMappingJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -32,9 +30,9 @@ public class GenericJavaManyToManyRelationship extends AbstractJavaMappingRelationship<JavaManyToManyMapping> implements JavaManyToManyRelationship { - protected final JavaMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final JavaMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final JavaJoinTableRelationshipStrategy joinTableStrategy; public GenericJavaManyToManyRelationship(JavaManyToManyMapping parent) { @@ -66,7 +64,7 @@ public class GenericJavaManyToManyRelationship // ********** strategy ********** @Override - protected JavaMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -76,7 +74,7 @@ public class GenericJavaManyToManyRelationship // ********** mapped by strategy ********** - public JavaMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -94,7 +92,7 @@ public class GenericJavaManyToManyRelationship return mapping.getKey() == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - protected JavaMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericJavaMappedByRelationshipStrategy(this); } @@ -119,7 +117,7 @@ public class GenericJavaManyToManyRelationship return this.getMappedByStrategy().getMappedByAttribute() == null; } - protected JavaMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected JavaJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericJavaMappingJoinTableRelationshipStrategy(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java index 2290d04a57..ee3bc4ab14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaManyToOneRelationship.java @@ -14,15 +14,13 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaMappingJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToOneRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingRelationshipStrategy2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -30,10 +28,10 @@ public class GenericJavaManyToOneRelationship extends AbstractJavaMappingRelationship<JavaManyToOneMapping> implements JavaManyToOneRelationship2_0 { - protected final JavaMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final JavaJoinColumnRelationshipStrategy joinColumnStrategy; // JPA 2.0 - protected final JavaMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final JavaJoinTableRelationshipStrategy joinTableStrategy; public GenericJavaManyToOneRelationship(JavaManyToOneMapping parent) { @@ -65,7 +63,7 @@ public class GenericJavaManyToOneRelationship // ********** strategy ********** @Override - protected JavaMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.isJpa2_0Compatible()) { if (this.joinTableStrategy.getJoinTable() != null) { return this.joinTableStrategy; @@ -95,7 +93,7 @@ public class GenericJavaManyToOneRelationship return false; } - protected JavaMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected JavaJoinTableRelationshipStrategy buildJoinTableStrategy() { return this.isJpa2_0Compatible() ? new GenericJavaMappingJoinTableRelationshipStrategy(this) : new NullJavaJoinTableRelationshipStrategy(this); @@ -123,7 +121,7 @@ public class GenericJavaManyToOneRelationship return this.joinTableStrategy.getJoinTable() == null; } - protected JavaMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected JavaJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericJavaMappingJoinColumnRelationshipStrategy(this); } 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 d7a4d19056..8427255472 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 @@ -24,8 +24,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaMappedByRelationship; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingMappedByRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.osgi.util.NLS; @@ -34,7 +34,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaMappedByRelationshipStrategy extends AbstractJavaJpaContextNode - implements JavaMappingMappedByRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, MappedByRelationshipStrategy { protected String mappedByAttribute; 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 c60e214277..c62fea2393 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 @@ -22,21 +22,20 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappingJoinColumnRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyJoinColumn; 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.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.resource.java.NullJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.db.Table; public class GenericJavaMappingJoinColumnRelationshipStrategy extends AbstractJavaJoinColumnRelationshipStrategy - implements JavaMappingJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0 { protected final boolean targetForeignKey; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java index 6f08cfe209..e7440e6c28 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToManyRelationship.java @@ -13,20 +13,17 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaMappingJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToManyRelationship2_0; import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -36,13 +33,13 @@ public class GenericJavaOneToManyRelationship extends AbstractJavaMappingRelationship<JavaOneToManyMapping> implements JavaOneToManyRelationship2_0 { - protected final JavaMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final JavaMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final JavaJoinTableRelationshipStrategy joinTableStrategy; // JPA 2.0 or EclipseLink protected final boolean supportsJoinColumnStrategy; - protected final JavaMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final JavaJoinColumnRelationshipStrategy joinColumnStrategy; public GenericJavaOneToManyRelationship(JavaOneToManyMapping parent, boolean supportsJoinColumnStrategy) { @@ -80,7 +77,7 @@ public class GenericJavaOneToManyRelationship // ********** strategy ********** @Override - protected JavaMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -95,7 +92,7 @@ public class GenericJavaOneToManyRelationship // ********** mapped by strategy ********** - public JavaMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -121,7 +118,7 @@ public class GenericJavaOneToManyRelationship return false; } - protected JavaMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericJavaMappedByRelationshipStrategy(this); } @@ -148,7 +145,7 @@ public class GenericJavaOneToManyRelationship ! this.joinColumnStrategy.hasSpecifiedJoinColumns(); } - protected JavaMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected JavaJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericJavaMappingJoinTableRelationshipStrategy(this); } @@ -174,7 +171,7 @@ public class GenericJavaOneToManyRelationship return false; } - protected JavaMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected JavaJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return this.supportsJoinColumnStrategy ? new GenericJavaMappingJoinColumnRelationshipStrategy(this, true) : // true = target foreign key new NullJavaJoinColumnRelationshipStrategy(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java index 2be62c732e..ab8131668c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOneToOneRelationship.java @@ -13,22 +13,18 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaMappingJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.NullJavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneRelationship2_0; import org.eclipse.jpt.jpa.core.resource.java.OwnableRelationshipMappingAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -38,14 +34,14 @@ public class GenericJavaOneToOneRelationship extends AbstractJavaMappingRelationship<JavaOneToOneMapping> implements JavaOneToOneRelationship2_0 { - protected final JavaMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 primaryKeyJoinColumnStrategy; + protected final JavaPrimaryKeyJoinColumnRelationshipStrategy primaryKeyJoinColumnStrategy; // JPA 2.0 - protected final JavaMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final JavaJoinTableRelationshipStrategy joinTableStrategy; - protected final JavaMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final JavaJoinColumnRelationshipStrategy joinColumnStrategy; public GenericJavaOneToOneRelationship(JavaOneToOneMapping parent) { @@ -83,7 +79,7 @@ public class GenericJavaOneToOneRelationship // ********** strategy ********** @Override - protected JavaMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -101,7 +97,7 @@ public class GenericJavaOneToOneRelationship // ********** mapped by strategy ********** - public JavaMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -121,7 +117,7 @@ public class GenericJavaOneToOneRelationship return mapping.getKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - protected JavaMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericJavaMappedByRelationshipStrategy(this); } @@ -144,7 +140,7 @@ public class GenericJavaOneToOneRelationship this.updateStrategy(); } - protected JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 buildPrimaryKeyJoinColumnStrategy() { + protected JavaPrimaryKeyJoinColumnRelationshipStrategy buildPrimaryKeyJoinColumnStrategy() { return new GenericJavaPrimaryKeyJoinColumnRelationshipStrategy(this); } @@ -171,7 +167,7 @@ public class GenericJavaOneToOneRelationship return false; } - protected JavaMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected JavaJoinTableRelationshipStrategy buildJoinTableStrategy() { return this.isJpa2_0Compatible() ? new GenericJavaMappingJoinTableRelationshipStrategy(this) : new NullJavaJoinTableRelationshipStrategy(this); @@ -203,7 +199,7 @@ public class GenericJavaOneToOneRelationship (this.joinTableStrategy.getJoinTable() == null); } - protected JavaMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected JavaJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericJavaMappingJoinColumnRelationshipStrategy(this); } 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 0b24dd4942..1d5cb6ca24 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 @@ -25,12 +25,13 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumnRelationship; +import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.OneToOnePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -38,7 +39,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaPrimaryKeyJoinColumnRelationshipStrategy extends AbstractJavaJpaContextNode - implements JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, JavaPrimaryKeyJoinColumnRelationshipStrategy { protected final ContextListContainer<JavaPrimaryKeyJoinColumn, PrimaryKeyJoinColumnAnnotation> primaryKeyJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; 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 192cb73136..4f48e852d1 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 @@ -24,10 +24,10 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualRelationship; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -38,16 +38,16 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericJavaVirtualJoinTable extends AbstractJavaVirtualReferenceTable<ReadOnlyJoinTable> - implements JavaVirtualJoinTable + implements VirtualJoinTable { - protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; - protected JavaVirtualJoinColumn defaultInverseJoinColumn; + protected VirtualJoinColumn defaultInverseJoinColumn; - public GenericJavaVirtualJoinTable(JavaVirtualJoinTableRelationshipStrategy parent, Owner owner, ReadOnlyJoinTable overriddenTable) { + public GenericJavaVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, Owner owner, ReadOnlyJoinTable overriddenTable) { super(parent, owner, overriddenTable); this.inverseJoinColumnOwner = this.buildInverseJoinColumnOwner(); this.specifiedInverseJoinColumnContainer = this.buildSpecifiedInverseJoinColumnContainer(); @@ -66,7 +66,7 @@ public class GenericJavaVirtualJoinTable // ********** inverse join columns ********** - public ListIterable<JavaVirtualJoinColumn> getInverseJoinColumns() { + public ListIterable<VirtualJoinColumn> getInverseJoinColumns() { return this.hasSpecifiedInverseJoinColumns() ? this.getSpecifiedInverseJoinColumns() : this.getDefaultInverseJoinColumns(); } @@ -77,7 +77,7 @@ public class GenericJavaVirtualJoinTable // ********** inverse specified join columns ********** - public ListIterable<JavaVirtualJoinColumn> getSpecifiedInverseJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedInverseJoinColumns() { return this.specifiedInverseJoinColumnContainer.getContextElements(); } @@ -89,7 +89,7 @@ public class GenericJavaVirtualJoinTable return this.getSpecifiedInverseJoinColumnsSize() != 0; } - public JavaVirtualJoinColumn getSpecifiedInverseJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedInverseJoinColumn(int index) { return this.specifiedInverseJoinColumnContainer.getContextElement(index); } @@ -101,19 +101,19 @@ public class GenericJavaVirtualJoinTable return new SuperListIterableWrapper<ReadOnlyJoinColumn>(this.getOverriddenTable().getSpecifiedInverseJoinColumns()); } - protected void moveSpecifiedInverseJoinColumn(int index, JavaVirtualJoinColumn joinColumn) { + protected void moveSpecifiedInverseJoinColumn(int index, VirtualJoinColumn joinColumn) { this.specifiedInverseJoinColumnContainer.moveContextElement(index, joinColumn); } - protected JavaVirtualJoinColumn addSpecifiedInverseJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn addSpecifiedInverseJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { return this.specifiedInverseJoinColumnContainer.addContextElement(index, joinColumn); } - protected void removeSpecifiedInverseJoinColumn(JavaVirtualJoinColumn joinColumn) { + protected void removeSpecifiedInverseJoinColumn(VirtualJoinColumn joinColumn) { this.specifiedInverseJoinColumnContainer.removeContextElement(joinColumn); } - protected ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedInverseJoinColumnContainer() { + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedInverseJoinColumnContainer() { return new SpecifiedInverseJoinColumnContainer(); } @@ -121,14 +121,14 @@ public class GenericJavaVirtualJoinTable * specified join column container */ protected class SpecifiedInverseJoinColumnContainer - extends ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; } @Override - protected JavaVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return GenericJavaVirtualJoinTable.this.buildInverseJoinColumn(resourceElement); } @Override @@ -136,7 +136,7 @@ public class GenericJavaVirtualJoinTable return GenericJavaVirtualJoinTable.this.getOverriddenInverseJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(JavaVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -144,20 +144,20 @@ public class GenericJavaVirtualJoinTable // ********** default inverse join column ********** - public JavaVirtualJoinColumn getDefaultInverseJoinColumn() { + public VirtualJoinColumn getDefaultInverseJoinColumn() { return this.defaultInverseJoinColumn; } - protected void setDefaultInverseJoinColumn(JavaVirtualJoinColumn joinColumn) { - JavaVirtualJoinColumn old = this.defaultInverseJoinColumn; + protected void setDefaultInverseJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultInverseJoinColumn; this.defaultInverseJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_INVERSE_JOIN_COLUMN, old, joinColumn); } - protected ListIterable<JavaVirtualJoinColumn> getDefaultInverseJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultInverseJoinColumns() { return (this.defaultInverseJoinColumn != null) ? - new SingleElementListIterable<JavaVirtualJoinColumn>(this.defaultInverseJoinColumn) : - EmptyListIterable.<JavaVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultInverseJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultInverseJoinColumnsSize() { @@ -184,11 +184,11 @@ public class GenericJavaVirtualJoinTable // ********** misc ********** @Override - public JavaVirtualJoinTableRelationshipStrategy getParent() { - return (JavaVirtualJoinTableRelationshipStrategy) super.getParent(); + public VirtualJoinTableRelationshipStrategy getParent() { + return (VirtualJoinTableRelationshipStrategy) super.getParent(); } - protected JavaVirtualJoinTableRelationshipStrategy getRelationshipStrategy() { + protected VirtualJoinTableRelationshipStrategy getRelationshipStrategy() { return this.getParent(); } @@ -201,7 +201,7 @@ public class GenericJavaVirtualJoinTable return new InverseJoinColumnOwner(); } - protected JavaVirtualJoinColumn buildInverseJoinColumn(ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildInverseJoinColumn(ReadOnlyJoinColumn joinColumn) { return this.buildJoinColumn(this.inverseJoinColumnOwner, joinColumn); } @@ -281,7 +281,7 @@ public class GenericJavaVirtualJoinTable return GenericJavaVirtualJoinTable.this.getValidationTextRange(); } - protected JavaVirtualRelationship getRelationship() { + protected VirtualRelationship getRelationship() { return GenericJavaVirtualJoinTable.this.getRelationshipStrategy().getRelationship(); } } 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 b0cd04a200..27a7e7cb87 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 @@ -53,7 +53,7 @@ import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; 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.orm.OrmPersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.text.edits.ReplaceEdit; @@ -448,7 +448,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> } public String getMetamodelTypeName() { - return ((OrmPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelTypeName(); + return ((PersistentAttribute2_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/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index 3d51c09769..435c6017cf 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 @@ -17,14 +17,14 @@ import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; +import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; 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.OrmEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmLobConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; @@ -57,8 +57,8 @@ public abstract class AbstractOrmBasicMapping<X extends XmlBasic> protected static final OrmConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmEnumeratedConverter.Adapter.instance(), - OrmTemporalConverter.BasicAdapter.instance(), + OrmBaseEnumeratedConverter.BasicAdapter.instance(), + OrmBaseTemporalConverter.BasicAdapter.instance(), OrmLobConverter.Adapter.instance() }; protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java index cea2d6de2c..765043f1b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaDbGenerator; -import org.eclipse.jpt.jpa.core.context.orm.OrmDbGenerator; +import org.eclipse.jpt.jpa.core.context.orm.OrmGenerator; import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Database; @@ -27,7 +27,7 @@ import org.eclipse.jpt.jpa.db.SchemaContainer; */ public abstract class AbstractOrmDbGenerator<X extends XmlGenerator> extends AbstractOrmGenerator<X> - implements OrmDbGenerator + implements DbGenerator { protected Integer specifiedInitialValue; 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 319af5deba..f792c3cbc1 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 @@ -73,7 +73,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaIdClassReference; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; @@ -86,7 +85,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmSecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.OrmTable; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualPrimaryKeyJoinColumn; @@ -1324,7 +1322,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return MappingTools.resolveOverriddenColumn(this.getOverridableTypeMapping(), attributeName); } - protected JavaReadOnlyAttributeOverride getJavaAttributeOverrideNamedForVirtual(String attributeName) { + protected ReadOnlyAttributeOverride getJavaAttributeOverrideNamedForVirtual(String attributeName) { JavaEntity javaEntity = this.getJavaTypeMappingForDefaults(); return (javaEntity == null) ? null : javaEntity.getAttributeOverrideContainer().getOverrideNamed(attributeName); } @@ -2149,7 +2147,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> * some common behavior */ protected abstract class NamedColumnOwner - implements OrmReadOnlyNamedColumn.Owner + implements ReadOnlyNamedColumn.Owner { public String getDefaultTableName() { return AbstractOrmEntity.this.getPrimaryTableName(); 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 6ad3ea7056..9a3f391f73 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 @@ -19,6 +19,7 @@ import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; +import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmColumnMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; @@ -26,7 +27,6 @@ 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.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; @@ -66,7 +66,7 @@ public abstract class AbstractOrmIdMapping<X extends XmlId> protected static final OrmConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmTemporalConverter.BasicAdapter.instance(), + OrmBaseTemporalConverter.BasicAdapter.instance(), }; protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); 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 e131cef90a..c8eefc797f 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,16 +11,17 @@ 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.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.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmManyToManyMapping2_0; +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; public abstract class AbstractOrmManyToManyMapping<X extends XmlManyToMany> extends AbstractOrmMultiRelationshipMapping<X> - implements OrmManyToManyMapping2_0 + implements ManyToManyMapping2_0, OrmManyToManyMapping { protected AbstractOrmManyToManyMapping(OrmPersistentAttribute 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 d5927bd21d..1c61b3ec98 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,8 +11,9 @@ 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.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmManyToOneMapping2_0; +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; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne; @@ -22,7 +23,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne; */ public abstract class AbstractOrmManyToOneMapping<X extends XmlManyToOne> extends AbstractOrmSingleRelationshipMapping<X> - implements OrmManyToOneMapping2_0 + implements ManyToOneMapping2_0, OrmManyToOneMapping { protected AbstractOrmManyToOneMapping(OrmPersistentAttribute 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/AbstractOrmMappingRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappingRelationship.java index b0387bc002..887f95aeb4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappingRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappingRelationship.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -19,7 +19,6 @@ import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; 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.OrmRelationshipMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlRelationshipMapping; /** @@ -31,7 +30,7 @@ public abstract class AbstractOrmMappingRelationship<M extends OrmRelationshipMa extends AbstractOrmXmlContextNode implements OrmMappingRelationship { - protected OrmMappingRelationshipStrategy2_0 strategy; + protected RelationshipStrategy strategy; protected AbstractOrmMappingRelationship(M parent) { @@ -50,17 +49,17 @@ public abstract class AbstractOrmMappingRelationship<M extends OrmRelationshipMa // ********** strategy ********** - public OrmMappingRelationshipStrategy2_0 getStrategy() { + public RelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(OrmMappingRelationshipStrategy2_0 strategy) { + protected void setStrategy(RelationshipStrategy strategy) { RelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected abstract OrmMappingRelationshipStrategy2_0 buildStrategy(); + protected abstract RelationshipStrategy buildStrategy(); /** * This is called by subclasses when the various supported strategies are 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 d1916024ff..31034c98a3 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,6 +34,7 @@ import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.JoinColumn; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -42,17 +43,18 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmMultiRelationshipMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -67,11 +69,9 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.MapKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_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.jpa2.context.orm.OrmMapKeyEnumeratedConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMapKeyTemporalConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlMultiRelationshipMapping; import org.eclipse.jpt.jpa.core.resource.orm.MapKey; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -91,7 +91,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM extends AbstractOrmRelationshipMapping<X> implements OrmMultiRelationshipMapping, OrmCollectionMapping2_0 { - protected final OrmOrderable orderable; + protected final Orderable orderable; protected String specifiedMapKey; protected boolean noMapKey = false; @@ -117,8 +117,8 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM protected static final OrmConverter.Adapter[] MAP_KEY_CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmMapKeyEnumeratedConverter2_0.Adapter.instance(), - OrmMapKeyTemporalConverter2_0.Adapter.instance() + OrmBaseEnumeratedConverter.MapKeyAdapter.instance(), + OrmBaseTemporalConverter.MapKeyAdapter.instance() }; protected static final Iterable<OrmConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(MAP_KEY_CONVERTER_ADAPTER_ARRAY); @@ -185,11 +185,11 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM // ********** orderable ********** - public OrmOrderable getOrderable() { + public Orderable getOrderable() { return this.orderable; } - protected OrmOrderable buildOrderable() { + protected Orderable buildOrderable() { return this.isOrmXml2_0Compatible() ? this.getContextNodeFactory2_0().buildOrmOrderable(this, this.buildOrderableOwner()) : this.getContextNodeFactory().buildOrmOrderable(this); @@ -208,7 +208,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM public Table resolveDbTable(String tableName) { return this.getRelationshipStrategy().resolveDbTable(tableName); } - protected OrmRelationshipStrategy getRelationshipStrategy() { + protected RelationshipStrategy getRelationshipStrategy() { return AbstractOrmMultiRelationshipMapping.this.getRelationship().getStrategy(); } } @@ -867,7 +867,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM @Override protected String getMetamodelFieldTypeName() { - return ((OrmPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); + return ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -877,7 +877,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = ((OrmPersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -1132,7 +1132,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM return AbstractOrmMultiRelationshipMapping.this.getValidationTextRange(); } - protected OrmRelationshipStrategy getRelationshipStrategy() { + protected RelationshipStrategy getRelationshipStrategy() { return AbstractOrmMultiRelationshipMapping.this.getRelationship().getStrategy(); } 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 f4a7c7a7c3..94657b883d 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,21 +11,22 @@ 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.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany> extends AbstractOrmMultiRelationshipMapping<X> - implements OrmOneToManyMapping2_0, OrmOrphanRemovalHolder2_0 + implements OneToManyMapping2_0, OrmOneToManyMapping, OrphanRemovalHolder2_0 { - protected final OrmOrphanRemovable2_0 orphanRemoval; + protected final OrphanRemovable2_0 orphanRemoval; protected AbstractOrmOneToManyMapping(OrmPersistentAttribute parent, X xmlMapping) { @@ -51,11 +52,11 @@ public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany> // ********** orphan removal ********** - public OrmOrphanRemovable2_0 getOrphanRemoval() { + public OrphanRemovable2_0 getOrphanRemoval() { return this.orphanRemoval; } - protected OrmOrphanRemovable2_0 buildOrphanRemoval() { + protected OrphanRemovable2_0 buildOrphanRemoval() { return this.isOrmXml2_0Compatible() ? this.getContextNodeFactory2_0().buildOrmOrphanRemoval(this) : new NullOrmOrphanRemoval2_0(this); 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 4302119c3d..25f21818cc 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -12,12 +12,13 @@ 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.OrmMappingRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmOrphanRemoval2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToOneRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; @@ -26,9 +27,9 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; */ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne> extends AbstractOrmSingleRelationshipMapping<X> - implements OrmOneToOneMapping2_0, OrmOrphanRemovalHolder2_0 + implements OneToOneMapping2_0, OrmOneToOneMapping, OrphanRemovalHolder2_0 { - protected final OrmOrphanRemovable2_0 orphanRemoval; + protected final OrphanRemovable2_0 orphanRemoval; protected AbstractOrmOneToOneMapping(OrmPersistentAttribute parent, X xmlMapping) { @@ -54,11 +55,11 @@ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne> // ********** orphan removal ********** - public OrmOrphanRemovable2_0 getOrphanRemoval() { + public OrphanRemovable2_0 getOrphanRemoval() { return this.orphanRemoval; } - protected OrmOrphanRemovable2_0 buildOrphanRemoval() { + protected OrphanRemovable2_0 buildOrphanRemoval() { return this.isOrmXml2_0Compatible() ? this.getContextNodeFactory2_0().buildOrmOrphanRemoval(this) : new NullOrmOrphanRemoval2_0(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java index 0a3daccdeb..b82eb7e7dc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java @@ -13,11 +13,11 @@ import java.util.Vector; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; public abstract class AbstractOrmReadOnlyUniqueConstraint extends AbstractOrmXmlContextNode - implements OrmReadOnlyUniqueConstraint + implements ReadOnlyUniqueConstraint { protected final Vector<String> columnNames = new Vector<String>(); 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 cb86f0fcaf..975a0206cb 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 @@ -17,11 +17,11 @@ import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; +import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; 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.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -53,7 +53,7 @@ public abstract class AbstractOrmVersionMapping<X extends XmlVersion> // the spec does not list Temporal explicitly, // but it is included in the orm.xml schema... protected static final OrmConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmTemporalConverter.BasicAdapter.instance(), + OrmBaseTemporalConverter.BasicAdapter.instance(), }; protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java index fa99cab821..6956890d94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java @@ -13,11 +13,10 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.VirtualBaseColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyBaseColumn; public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn.Owner, C extends ReadOnlyBaseColumn> extends AbstractOrmVirtualNamedColumn<O, C> - implements VirtualBaseColumn, OrmReadOnlyBaseColumn + implements VirtualBaseColumn { protected String specifiedTable; protected String defaultTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java index 6bb790c6fd..df2498292a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.VirtualNamedColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Column; import org.eclipse.jpt.jpa.db.Table; @@ -33,7 +32,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColumn.Owner, C extends ReadOnlyNamedColumn> extends AbstractOrmXmlContextNode - implements VirtualNamedColumn, OrmReadOnlyNamedColumn + implements VirtualNamedColumn { protected final O owner; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java index 34269f91a2..762cb45076 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedDiscriminatorColumn.java @@ -13,11 +13,10 @@ import org.eclipse.jpt.jpa.core.context.DiscriminatorType; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.VirtualNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedDiscriminatorColumn; public abstract class AbstractOrmVirtualNamedDiscriminatorColumn<O extends ReadOnlyNamedDiscriminatorColumn.Owner, C extends ReadOnlyNamedDiscriminatorColumn> extends AbstractOrmVirtualNamedColumn<O, C> - implements VirtualNamedDiscriminatorColumn, OrmReadOnlyNamedDiscriminatorColumn + implements VirtualNamedDiscriminatorColumn { protected Integer specifiedLength; protected int defaultLength; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java index bfd0355576..30c0614eb6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java @@ -17,8 +17,8 @@ import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrappe import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; import org.eclipse.jpt.jpa.core.context.VirtualReferenceTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -26,10 +26,10 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen extends AbstractOrmVirtualTable<T> implements VirtualReferenceTable { - protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner joinColumnOwner; - protected OrmVirtualJoinColumn defaultJoinColumn; + protected VirtualJoinColumn defaultJoinColumn; protected AbstractOrmVirtualReferenceTable(JpaContextNode parent, Owner owner, T overridenTable) { @@ -51,7 +51,7 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen // ********** join columns ********** - public ListIterable<OrmVirtualJoinColumn> getJoinColumns() { + public ListIterable<VirtualJoinColumn> getJoinColumns() { return this.hasSpecifiedJoinColumns() ? this.getSpecifiedJoinColumns() : this.getDefaultJoinColumns(); } @@ -62,7 +62,7 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen // ********** specified join columns ********** - public ListIterable<OrmVirtualJoinColumn> getSpecifiedJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedJoinColumns() { return this.specifiedJoinColumnContainer.getContextElements(); } @@ -74,7 +74,7 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen return this.getSpecifiedJoinColumnsSize() != 0; } - public OrmVirtualJoinColumn getSpecifiedJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedJoinColumn(int index) { return this.specifiedJoinColumnContainer.getContextElement(index); } @@ -86,19 +86,19 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen return new SuperListIterableWrapper<ReadOnlyJoinColumn>(this.getOverriddenTable().getSpecifiedJoinColumns()); } - protected void moveSpecifiedJoinColumn(int index, OrmVirtualJoinColumn joinColumn) { + protected void moveSpecifiedJoinColumn(int index, VirtualJoinColumn joinColumn) { this.specifiedJoinColumnContainer.moveContextElement(index, joinColumn); } - protected OrmVirtualJoinColumn addSpecifiedJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn addSpecifiedJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { return this.specifiedJoinColumnContainer.addContextElement(index, joinColumn); } - protected void removeSpecifiedJoinColumn(OrmVirtualJoinColumn joinColumn) { + protected void removeSpecifiedJoinColumn(VirtualJoinColumn joinColumn) { this.specifiedJoinColumnContainer.removeContextElement(joinColumn); } - protected ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { return new SpecifiedJoinColumnContainer(); } @@ -106,14 +106,14 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen * specified join column container */ protected class SpecifiedJoinColumnContainer - extends ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_JOIN_COLUMNS_LIST; } @Override - protected OrmVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return AbstractOrmVirtualReferenceTable.this.buildJoinColumn(resourceElement); } @Override @@ -121,7 +121,7 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen return AbstractOrmVirtualReferenceTable.this.getOverriddenJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(OrmVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -129,20 +129,20 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen // ********** default join column ********** - public OrmVirtualJoinColumn getDefaultJoinColumn() { + public VirtualJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(OrmVirtualJoinColumn joinColumn) { - OrmVirtualJoinColumn old = this.defaultJoinColumn; + protected void setDefaultJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultJoinColumn; this.defaultJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_JOIN_COLUMN_PROPERTY, old, joinColumn); } - protected ListIterable<OrmVirtualJoinColumn> getDefaultJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultJoinColumns() { return (this.defaultJoinColumn != null) ? - new SingleElementListIterable<OrmVirtualJoinColumn>(this.defaultJoinColumn) : - EmptyListIterable.<OrmVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultJoinColumnsSize() { @@ -168,11 +168,11 @@ public abstract class AbstractOrmVirtualReferenceTable<T extends ReadOnlyReferen // ********** misc ********** - protected OrmVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn joinColumn) { return this.buildJoinColumn(this.joinColumnOwner, joinColumn); } - protected OrmVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn.Owner columnOwner, ReadOnlyJoinColumn joinColumn) { return this.getContextNodeFactory().buildOrmVirtualJoinColumn(this, columnOwner, joinColumn); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java index 8610cfbfd8..e4d37b097b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java @@ -18,8 +18,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.VirtualTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; @@ -29,7 +28,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> extends AbstractOrmXmlContextNode - implements VirtualTable, OrmReadOnlyTable + implements VirtualTable { protected final Owner owner; @@ -44,7 +43,7 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> protected String specifiedCatalog; protected String defaultCatalog; - protected final ContextListContainer<OrmVirtualUniqueConstraint, ReadOnlyUniqueConstraint> uniqueConstraintContainer; + protected final ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> uniqueConstraintContainer; protected AbstractOrmVirtualTable(JpaContextNode parent, Owner owner, T overridenTable) { @@ -185,7 +184,7 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> // ********** unique constraints ********** - public ListIterable<OrmVirtualUniqueConstraint> getUniqueConstraints() { + public ListIterable<VirtualUniqueConstraint> getUniqueConstraints() { return this.uniqueConstraintContainer.getContextElements(); } @@ -193,7 +192,7 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> return this.uniqueConstraintContainer.getContextElementsSize(); } - public OrmVirtualUniqueConstraint getUniqueConstraint(int index) { + public VirtualUniqueConstraint getUniqueConstraint(int index) { return this.uniqueConstraintContainer.getContextElement(index); } @@ -205,23 +204,23 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> return new SuperListIterableWrapper<ReadOnlyUniqueConstraint>(this.getOverriddenTable().getUniqueConstraints()); } - protected void moveUniqueConstraint(int index, OrmVirtualUniqueConstraint constraint) { + protected void moveUniqueConstraint(int index, VirtualUniqueConstraint constraint) { this.uniqueConstraintContainer.moveContextElement(index, constraint); } - protected OrmVirtualUniqueConstraint addUniqueConstraint(int index, ReadOnlyUniqueConstraint uniqueConstraint) { + protected VirtualUniqueConstraint addUniqueConstraint(int index, ReadOnlyUniqueConstraint uniqueConstraint) { return this.uniqueConstraintContainer.addContextElement(index, uniqueConstraint); } - protected OrmVirtualUniqueConstraint buildUniqueConstraint(ReadOnlyUniqueConstraint uniqueConstraint) { + protected VirtualUniqueConstraint buildUniqueConstraint(ReadOnlyUniqueConstraint uniqueConstraint) { return this.getContextNodeFactory().buildOrmVirtualUniqueConstraint(this, uniqueConstraint); } - protected void removeUniqueConstraint(OrmVirtualUniqueConstraint constraint) { + protected void removeUniqueConstraint(VirtualUniqueConstraint constraint) { this.uniqueConstraintContainer.removeContextElement(constraint); } - protected ContextListContainer<OrmVirtualUniqueConstraint, ReadOnlyUniqueConstraint> buildUniqueConstraintContainer() { + protected ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> buildUniqueConstraintContainer() { return new UniqueConstraintContainer(); } @@ -229,14 +228,14 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> * unique constraint container */ protected class UniqueConstraintContainer - extends ContextListContainer<OrmVirtualUniqueConstraint, ReadOnlyUniqueConstraint> + extends ContextListContainer<VirtualUniqueConstraint, ReadOnlyUniqueConstraint> { @Override protected String getContextElementsPropertyName() { return UNIQUE_CONSTRAINTS_LIST; } @Override - protected OrmVirtualUniqueConstraint buildContextElement(ReadOnlyUniqueConstraint resourceElement) { + protected VirtualUniqueConstraint buildContextElement(ReadOnlyUniqueConstraint resourceElement) { return AbstractOrmVirtualTable.this.buildUniqueConstraint(resourceElement); } @Override @@ -244,7 +243,7 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> return AbstractOrmVirtualTable.this.getOverriddenUniqueConstraints(); } @Override - protected ReadOnlyUniqueConstraint getResourceElement(OrmVirtualUniqueConstraint contextElement) { + protected ReadOnlyUniqueConstraint getResourceElement(VirtualUniqueConstraint contextElement) { return contextElement.getOverriddenUniqueConstraint(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java index 95b5162cfc..a7914e4054 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; 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.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; @@ -19,6 +20,12 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; @@ -50,7 +57,6 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmNamedNativeQuery; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery; 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.OrmOrderable; 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; @@ -70,14 +76,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmUniqueConstraint; import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualSecondaryTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.context.orm.OrmXml; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericEntityMappings; @@ -231,7 +231,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmJoinTable(parent, owner); } - public OrmVirtualJoinTable buildOrmVirtualJoinTable(OrmVirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable) { + public VirtualJoinTable buildOrmVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, ReadOnlyTable.Owner owner, ReadOnlyJoinTable overriddenTable) { return new GenericOrmVirtualJoinTable(parent, owner, overriddenTable); } @@ -239,7 +239,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmJoinColumn(parent, owner, xmlJoinColumn); } - public OrmVirtualJoinColumn buildOrmVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { + public VirtualJoinColumn buildOrmVirtualJoinColumn(JpaContextNode parent, ReadOnlyJoinColumn.Owner owner, ReadOnlyJoinColumn overriddenColumn) { return new GenericOrmVirtualJoinColumn(parent, owner, overriddenColumn); } @@ -271,7 +271,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmOverrideRelationship(parent); } - public OrmVirtualOverrideRelationship buildOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent) { + public VirtualOverrideRelationship buildOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent) { return new GenericOrmVirtualOverrideRelationship(parent); } @@ -283,7 +283,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmColumn(parent, owner); } - public OrmVirtualColumn buildOrmVirtualColumn(JpaContextNode parent, OrmVirtualColumn.Owner owner) { + public VirtualColumn buildOrmVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner) { return new GenericOrmVirtualColumn(parent, owner); } @@ -371,7 +371,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmUniqueConstraint(parent, owner, resourceUniqueConstraint); } - public OrmVirtualUniqueConstraint buildOrmVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint) { + public VirtualUniqueConstraint buildOrmVirtualUniqueConstraint(JpaContextNode parent, ReadOnlyUniqueConstraint overriddenUniqueConstraint) { return new GenericOrmVirtualUniqueConstraint(parent, overriddenUniqueConstraint); } @@ -387,7 +387,7 @@ public abstract class AbstractOrmXmlContextNodeFactory return new GenericOrmBaseTemporalConverter(parent, owner); } - public OrmOrderable buildOrmOrderable(OrmAttributeMapping parent) { + public Orderable buildOrmOrderable(OrmAttributeMapping parent) { return new GenericOrmOrderable(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java index c9aba0dfb6..6218fdb5ec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToManyRelationship.java @@ -13,16 +13,14 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; 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.OrmMappedByRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToMany; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -31,9 +29,9 @@ public class GenericOrmManyToManyRelationship extends AbstractOrmMappingRelationship<OrmManyToManyMapping> implements OrmManyToManyRelationship { - protected final OrmMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final OrmMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final OrmJoinTableRelationshipStrategy joinTableStrategy; public GenericOrmManyToManyRelationship(OrmManyToManyMapping parent) { @@ -65,7 +63,7 @@ public class GenericOrmManyToManyRelationship // ********** strategy ********** @Override - protected OrmMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -75,7 +73,7 @@ public class GenericOrmManyToManyRelationship // ********** mapped by strategy ********** - public OrmMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -93,7 +91,7 @@ public class GenericOrmManyToManyRelationship return mapping.getKey() == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - protected OrmMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericOrmMappedByRelationshipStrategy(this); } @@ -118,7 +116,7 @@ public class GenericOrmManyToManyRelationship return this.mappedByStrategy.getMappedByAttribute() == null; } - protected OrmMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected OrmJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericOrmMappingJoinTableRelationshipStrategy(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java index 2746d84366..1ec603324b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmManyToOneRelationship.java @@ -14,13 +14,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmManyToOneRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlManyToOne; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -29,10 +27,10 @@ public class GenericOrmManyToOneRelationship extends AbstractOrmMappingRelationship<OrmManyToOneMapping> implements OrmManyToOneRelationship2_0 { - protected final OrmMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final OrmJoinColumnRelationshipStrategy joinColumnStrategy; // JPA 2.0 - protected final OrmMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final OrmJoinTableRelationshipStrategy joinTableStrategy; public GenericOrmManyToOneRelationship(OrmManyToOneMapping parent) { @@ -64,7 +62,7 @@ public class GenericOrmManyToOneRelationship // ********** strategy ********** @Override - protected OrmMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.isJpa2_0Compatible()) { if (this.joinTableStrategy.getJoinTable() != null){ return this.joinTableStrategy; @@ -94,7 +92,7 @@ public class GenericOrmManyToOneRelationship return false; } - protected OrmMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected OrmJoinTableRelationshipStrategy buildJoinTableStrategy() { return this.isJpa2_0Compatible() ? new GenericOrmMappingJoinTableRelationshipStrategy(this) : new NullOrmJoinTableRelationshipStrategy(this); @@ -123,7 +121,7 @@ public class GenericOrmManyToOneRelationship return this.joinTableStrategy.getJoinTable() == null; } - protected OrmMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected OrmJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericOrmMappingJoinColumnRelationshipStrategy(this); } 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 1990986c09..39d7b4102e 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 @@ -23,8 +23,8 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmMappedByRelationship; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingMappedByRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlMappedByMapping; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.osgi.util.NLS; @@ -33,7 +33,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericOrmMappedByRelationshipStrategy extends AbstractOrmXmlContextNode - implements OrmMappingMappedByRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, MappedByRelationshipStrategy { protected String mappedByAttribute; 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 1543de4494..345057d72d 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 @@ -23,13 +23,13 @@ import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.EntityTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.db.Table; public class GenericOrmMappingJoinColumnRelationshipStrategy extends AbstractOrmJoinColumnRelationshipStrategy - implements OrmMappingJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0 { protected final boolean targetForeignKey; 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 bab7e57557..540a43864e 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 @@ -21,12 +21,12 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.InverseJoinColumnValidator import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinTableTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinTableValidator; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; public class GenericOrmMappingJoinTableRelationshipStrategy extends AbstractOrmJoinTableRelationshipStrategy - implements OrmMappingJoinTableRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0 { public GenericOrmMappingJoinTableRelationshipStrategy(OrmMappingJoinTableRelationship parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java index 1044a31a1e..298492af25 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToManyRelationship.java @@ -13,19 +13,16 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -35,13 +32,13 @@ public class GenericOrmOneToManyRelationship extends AbstractOrmMappingRelationship<OrmOneToManyMapping> implements OrmOneToManyRelationship2_0 { - protected final OrmMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final OrmMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final OrmJoinTableRelationshipStrategy joinTableStrategy; // JPA 2.0 or EclipseLink protected final boolean supportsJoinColumnStrategy; - protected final OrmMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final OrmJoinColumnRelationshipStrategy joinColumnStrategy; public GenericOrmOneToManyRelationship(OrmOneToManyMapping parent, boolean supportsJoinColumnStrategy) { @@ -79,7 +76,7 @@ public class GenericOrmOneToManyRelationship // ********** strategy ********** @Override - protected OrmMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -94,7 +91,7 @@ public class GenericOrmOneToManyRelationship // ********** mapped by strategy ********** - public OrmMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -120,7 +117,7 @@ public class GenericOrmOneToManyRelationship return false; } - protected OrmMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericOrmMappedByRelationshipStrategy(this); } @@ -147,7 +144,7 @@ public class GenericOrmOneToManyRelationship ! this.joinColumnStrategy.hasSpecifiedJoinColumns(); } - protected OrmMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected OrmJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericOrmMappingJoinTableRelationshipStrategy(this); } @@ -173,7 +170,7 @@ public class GenericOrmOneToManyRelationship return false; } - protected OrmMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected OrmJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return this.supportsJoinColumnStrategy ? new GenericOrmMappingJoinColumnRelationshipStrategy(this, true) : // true = target foreign key new NullOrmJoinColumnRelationshipStrategy(this); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java index c5c15f3921..b40a3ad1a9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmOneToOneRelationship.java @@ -13,20 +13,16 @@ import java.util.List; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.MappedByRelationship; +import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedByRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingMappedByRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToOneRelationship2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -36,14 +32,14 @@ public class GenericOrmOneToOneRelationship extends AbstractOrmMappingRelationship<OrmOneToOneMapping> implements OrmOneToOneRelationship2_0 { - protected final OrmMappingMappedByRelationshipStrategy2_0 mappedByStrategy; + protected final MappedByRelationshipStrategy mappedByStrategy; - protected final OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 primaryKeyJoinColumnStrategy; + protected final OrmPrimaryKeyJoinColumnRelationshipStrategy primaryKeyJoinColumnStrategy; // JPA 2.0 - protected final OrmMappingJoinTableRelationshipStrategy2_0 joinTableStrategy; + protected final OrmJoinTableRelationshipStrategy joinTableStrategy; - protected final OrmMappingJoinColumnRelationshipStrategy2_0 joinColumnStrategy; + protected final OrmJoinColumnRelationshipStrategy joinColumnStrategy; public GenericOrmOneToOneRelationship(OrmOneToOneMapping parent) { @@ -81,7 +77,7 @@ public class GenericOrmOneToOneRelationship // ********** strategy ********** @Override - protected OrmMappingRelationshipStrategy2_0 buildStrategy() { + protected RelationshipStrategy buildStrategy() { if (this.mappedByStrategy.getMappedByAttribute() != null) { return this.mappedByStrategy; } @@ -99,7 +95,7 @@ public class GenericOrmOneToOneRelationship // ********** mapped by strategy ********** - public OrmMappedByRelationshipStrategy getMappedByStrategy() { + public MappedByRelationshipStrategy getMappedByStrategy() { return this.mappedByStrategy; } @@ -119,7 +115,7 @@ public class GenericOrmOneToOneRelationship return mapping.getKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - protected OrmMappingMappedByRelationshipStrategy2_0 buildMappedByStrategy() { + protected MappedByRelationshipStrategy buildMappedByStrategy() { return new GenericOrmMappedByRelationshipStrategy(this); } @@ -142,7 +138,7 @@ public class GenericOrmOneToOneRelationship this.updateStrategy(); } - protected OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 buildPrimaryKeyJoinColumnStrategy() { + protected OrmPrimaryKeyJoinColumnRelationshipStrategy buildPrimaryKeyJoinColumnStrategy() { return new GenericOrmPrimaryKeyJoinColumnRelationshipStrategy(this); } @@ -169,7 +165,7 @@ public class GenericOrmOneToOneRelationship return false; } - protected OrmMappingJoinTableRelationshipStrategy2_0 buildJoinTableStrategy() { + protected OrmJoinTableRelationshipStrategy buildJoinTableStrategy() { return this.isJpa2_0Compatible() ? new GenericOrmMappingJoinTableRelationshipStrategy(this) : new NullOrmJoinTableRelationshipStrategy(this); @@ -201,7 +197,7 @@ public class GenericOrmOneToOneRelationship (this.joinTableStrategy.getJoinTable() == null); } - protected OrmMappingJoinColumnRelationshipStrategy2_0 buildJoinColumnStrategy() { + protected OrmJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericOrmMappingJoinColumnRelationshipStrategy(this); } 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 9cca0f8773..e79231aa95 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 @@ -24,11 +24,12 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.OneToOnePrimaryKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlPrimaryKeyJoinColumnContainer; @@ -38,7 +39,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericOrmPrimaryKeyJoinColumnRelationshipStrategy extends AbstractOrmXmlContextNode - implements OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, OrmPrimaryKeyJoinColumnRelationshipStrategy { protected final ContextListContainer<OrmPrimaryKeyJoinColumn, XmlPrimaryKeyJoinColumn> primaryKeyJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner primaryKeyJoinColumnOwner; 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 55bf49a7f3..4ce22237d2 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 @@ -24,10 +24,10 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualRelationship; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -38,16 +38,16 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericOrmVirtualJoinTable extends AbstractOrmVirtualReferenceTable<ReadOnlyJoinTable> - implements OrmVirtualJoinTable + implements VirtualJoinTable { - protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedInverseJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner inverseJoinColumnOwner; - protected OrmVirtualJoinColumn defaultInverseJoinColumn; + protected VirtualJoinColumn defaultInverseJoinColumn; - public GenericOrmVirtualJoinTable(OrmVirtualJoinTableRelationshipStrategy parent, Owner owner, ReadOnlyJoinTable overriddenTable) { + public GenericOrmVirtualJoinTable(VirtualJoinTableRelationshipStrategy parent, Owner owner, ReadOnlyJoinTable overriddenTable) { super(parent, owner, overriddenTable); this.inverseJoinColumnOwner = this.buildInverseJoinColumnOwner(); this.specifiedInverseJoinColumnContainer = this.buildSpecifiedInverseJoinColumnContainer(); @@ -66,7 +66,7 @@ public class GenericOrmVirtualJoinTable // ********** inverse join columns ********** - public ListIterable<OrmVirtualJoinColumn> getInverseJoinColumns() { + public ListIterable<VirtualJoinColumn> getInverseJoinColumns() { return this.hasSpecifiedInverseJoinColumns() ? this.getSpecifiedInverseJoinColumns() : this.getDefaultInverseJoinColumns(); } @@ -77,7 +77,7 @@ public class GenericOrmVirtualJoinTable // ********** specified inverse join columns ********** - public ListIterable<OrmVirtualJoinColumn> getSpecifiedInverseJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedInverseJoinColumns() { return this.specifiedInverseJoinColumnContainer.getContextElements(); } @@ -89,7 +89,7 @@ public class GenericOrmVirtualJoinTable return this.getSpecifiedInverseJoinColumnsSize() != 0; } - public OrmVirtualJoinColumn getSpecifiedInverseJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedInverseJoinColumn(int index) { return this.specifiedInverseJoinColumnContainer.getContextElement(index); } @@ -101,19 +101,19 @@ public class GenericOrmVirtualJoinTable return new SuperListIterableWrapper<ReadOnlyJoinColumn>(this.getOverriddenTable().getSpecifiedInverseJoinColumns()); } - protected void moveSpecifiedInverseJoinColumn(int index, OrmVirtualJoinColumn joinColumn) { + protected void moveSpecifiedInverseJoinColumn(int index, VirtualJoinColumn joinColumn) { this.specifiedInverseJoinColumnContainer.moveContextElement(index, joinColumn); } - protected OrmVirtualJoinColumn addSpecifiedInverseJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn addSpecifiedInverseJoinColumn(int index, ReadOnlyJoinColumn joinColumn) { return this.specifiedInverseJoinColumnContainer.addContextElement(index, joinColumn); } - protected void removeSpecifiedInverseJoinColumn(OrmVirtualJoinColumn joinColumn) { + protected void removeSpecifiedInverseJoinColumn(VirtualJoinColumn joinColumn) { this.specifiedInverseJoinColumnContainer.removeContextElement(joinColumn); } - protected ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedInverseJoinColumnContainer() { + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedInverseJoinColumnContainer() { return new SpecifiedInverseJoinColumnContainer(); } @@ -121,14 +121,14 @@ public class GenericOrmVirtualJoinTable * specified inverse join column container */ protected class SpecifiedInverseJoinColumnContainer - extends ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; } @Override - protected OrmVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return GenericOrmVirtualJoinTable.this.buildInverseJoinColumn(resourceElement); } @Override @@ -136,7 +136,7 @@ public class GenericOrmVirtualJoinTable return GenericOrmVirtualJoinTable.this.getOverriddenInverseJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(OrmVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -144,20 +144,20 @@ public class GenericOrmVirtualJoinTable // ********** default inverse join column ********** - public OrmVirtualJoinColumn getDefaultInverseJoinColumn() { + public VirtualJoinColumn getDefaultInverseJoinColumn() { return this.defaultInverseJoinColumn; } - protected void setDefaultInverseJoinColumn(OrmVirtualJoinColumn joinColumn) { - OrmVirtualJoinColumn old = this.defaultInverseJoinColumn; + protected void setDefaultInverseJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultInverseJoinColumn; this.defaultInverseJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_INVERSE_JOIN_COLUMN, old, joinColumn); } - protected ListIterable<OrmVirtualJoinColumn> getDefaultInverseJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultInverseJoinColumns() { return (this.defaultInverseJoinColumn != null) ? - new SingleElementListIterable<OrmVirtualJoinColumn>(this.defaultInverseJoinColumn) : - EmptyListIterable.<OrmVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultInverseJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultInverseJoinColumnsSize() { @@ -184,11 +184,11 @@ public class GenericOrmVirtualJoinTable // ********** misc ********** @Override - public OrmVirtualJoinTableRelationshipStrategy getParent() { - return (OrmVirtualJoinTableRelationshipStrategy) super.getParent(); + public VirtualJoinTableRelationshipStrategy getParent() { + return (VirtualJoinTableRelationshipStrategy) super.getParent(); } - protected OrmVirtualJoinTableRelationshipStrategy getRelationshipStrategy() { + protected VirtualJoinTableRelationshipStrategy getRelationshipStrategy() { return this.getParent(); } @@ -201,7 +201,7 @@ public class GenericOrmVirtualJoinTable return new InverseJoinColumnOwner(); } - protected OrmVirtualJoinColumn buildInverseJoinColumn(ReadOnlyJoinColumn joinColumn) { + protected VirtualJoinColumn buildInverseJoinColumn(ReadOnlyJoinColumn joinColumn) { return this.buildJoinColumn(this.inverseJoinColumnOwner, joinColumn); } @@ -281,11 +281,11 @@ public class GenericOrmVirtualJoinTable return GenericOrmVirtualJoinTable.this.getValidationTextRange(); } - protected OrmVirtualRelationship getRelationship() { + protected VirtualRelationship getRelationship() { return this.getRelationshipStrategy().getRelationship(); } - protected OrmVirtualJoinTableRelationshipStrategy getRelationshipStrategy() { + protected VirtualJoinTableRelationshipStrategy getRelationshipStrategy() { return GenericOrmVirtualJoinTable.this.getRelationshipStrategy(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java index 737e39d26b..1bc7767e57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java @@ -25,9 +25,9 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.db.Table; @@ -36,15 +36,15 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy extends AbstractOrmXmlContextNode - implements OrmVirtualJoinColumnRelationshipStrategy + implements VirtualJoinColumnRelationshipStrategy { - protected final ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner joinColumnOwner; - protected OrmVirtualJoinColumn defaultJoinColumn; + protected VirtualJoinColumn defaultJoinColumn; - public GenericOrmVirtualOverrideJoinColumnRelationshipStrategy(OrmVirtualOverrideRelationship parent) { + public GenericOrmVirtualOverrideJoinColumnRelationshipStrategy(VirtualOverrideRelationship parent) { super(parent); this.joinColumnOwner = this.buildJoinColumnOwner(); this.specifiedJoinColumnContainer = this.buildSpecifiedJoinColumnContainer(); @@ -63,7 +63,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy // ********** join columns ********** - public ListIterable<OrmVirtualJoinColumn> getJoinColumns() { + public ListIterable<VirtualJoinColumn> getJoinColumns() { return this.hasSpecifiedJoinColumns() ? this.getSpecifiedJoinColumns() : this.getDefaultJoinColumns(); } @@ -74,7 +74,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy // ********** specified join columns ********** - public ListIterable<OrmVirtualJoinColumn> getSpecifiedJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedJoinColumns() { return this.specifiedJoinColumnContainer.getContextElements(); } @@ -86,7 +86,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return this.getSpecifiedJoinColumnsSize() != 0; } - public OrmVirtualJoinColumn getSpecifiedJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedJoinColumn(int index) { return this.specifiedJoinColumnContainer.getContextElement(index); } @@ -101,7 +101,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy new SuperListIterableWrapper<ReadOnlyJoinColumn>(overriddenStrategy.getSpecifiedJoinColumns()); } - protected ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer() { return new SpecifiedJoinColumnContainer(); } @@ -109,14 +109,14 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy * specified join column container */ protected class SpecifiedJoinColumnContainer - extends ContextListContainer<OrmVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_JOIN_COLUMNS_LIST; } @Override - protected OrmVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.buildJoinColumn(resourceElement); } @Override @@ -124,7 +124,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.this.getOverriddenSpecifiedJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(OrmVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -136,20 +136,20 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy // ********** default join column ********** - public OrmVirtualJoinColumn getDefaultJoinColumn() { + public VirtualJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(OrmVirtualJoinColumn joinColumn) { - OrmVirtualJoinColumn old = this.defaultJoinColumn; + protected void setDefaultJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultJoinColumn; this.defaultJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_JOIN_COLUMN_PROPERTY, old, joinColumn); } - protected ListIterable<OrmVirtualJoinColumn> getDefaultJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultJoinColumns() { return (this.defaultJoinColumn != null) ? - new SingleElementListIterable<OrmVirtualJoinColumn>(this.defaultJoinColumn) : - EmptyListIterable.<OrmVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultJoinColumnsSize() { @@ -180,11 +180,11 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy // ********** misc ********** @Override - public OrmVirtualOverrideRelationship getParent() { - return (OrmVirtualOverrideRelationship) super.getParent(); + public VirtualOverrideRelationship getParent() { + return (VirtualOverrideRelationship) super.getParent(); } - public OrmVirtualOverrideRelationship getRelationship() { + public VirtualOverrideRelationship getRelationship() { return this.getParent(); } @@ -293,7 +293,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy return this.getRelationship().getAttributeName(); } - protected OrmVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn overriddenJoinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn overriddenJoinColumn) { return this.getContextNodeFactory().buildOrmVirtualJoinColumn(this, this.joinColumnOwner, overriddenJoinColumn); } @@ -303,7 +303,7 @@ public class GenericOrmVirtualOverrideJoinColumnRelationshipStrategy @Override public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - for (OrmVirtualJoinColumn joinColumn : this.getJoinColumns()) { + for (VirtualJoinColumn joinColumn : this.getJoinColumns()) { joinColumn.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java index 06a161c6b2..9b979ebf21 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/NullOrmJoinTableRelationshipStrategy.java @@ -15,15 +15,16 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinTable; import org.eclipse.jpt.jpa.db.Table; public class NullOrmJoinTableRelationshipStrategy extends AbstractOrmXmlContextNode - implements OrmMappingJoinTableRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, OrmJoinTableRelationshipStrategy { public NullOrmJoinTableRelationshipStrategy(OrmJoinTableRelationship parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java index 8340ba98af..1772300220 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java @@ -39,8 +39,7 @@ import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentType import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmPersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAccessHolder; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.text.edits.ReplaceEdit; @@ -52,7 +51,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class SpecifiedOrmPersistentAttribute extends AbstractOrmXmlContextNode - implements OrmPersistentAttribute2_0 { + implements OrmPersistentAttribute, PersistentAttribute2_0 { protected OrmAttributeMapping mapping; // never null @@ -517,7 +516,7 @@ public abstract class SpecifiedOrmPersistentAttribute } public String getMetamodelTypeName() { - JavaPersistentAttribute2_0 javaAttribute = (JavaPersistentAttribute2_0) this.javaPersistentAttribute; + PersistentAttribute2_0 javaAttribute = (PersistentAttribute2_0) this.javaPersistentAttribute; return (javaAttribute != null) ? javaAttribute.getMetamodelTypeName() : MetamodelField.DEFAULT_TYPE_NAME; 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 ab4153a683..30f5edad7f 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 @@ -63,8 +63,7 @@ import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelSourceType; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentType2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmPersistentType2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.OrmPackage; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; @@ -85,7 +84,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class SpecifiedOrmPersistentType extends AbstractOrmXmlContextNode - implements OrmPersistentType2_0 { + implements OrmPersistentType, PersistentType2_0 { protected OrmTypeMapping mapping; // never null @@ -1065,7 +1064,7 @@ public abstract class SpecifiedOrmPersistentType protected String buildDeclaringTypeName_() { return (this.javaPersistentType == null) ? - null : ((JavaPersistentType2_0) this.javaPersistentType).getDeclaringTypeName(); + null : ((PersistentType2_0) this.javaPersistentType).getDeclaringTypeName(); } 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 04e1026a90..d00ff6f3e4 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 @@ -26,11 +26,12 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; 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.java.JavaPersistentAttribute2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmReadOnlyPersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyPersistentAttribute2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -39,7 +40,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class VirtualOrmPersistentAttribute extends AbstractOrmXmlContextNode - implements OrmReadOnlyPersistentAttribute2_0 + implements OrmReadOnlyPersistentAttribute, ReadOnlyPersistentAttribute2_0 { protected final Accessor javaAccessor; @@ -168,8 +169,8 @@ public class VirtualOrmPersistentAttribute return (javaType == null) ? null : javaType.getAttributeFor(this.getJavaResourceAttribute()); } - protected JavaPersistentAttribute2_0 getJavaPersistentAttribute2_0() { - return (JavaPersistentAttribute2_0) this.getJavaPersistentAttribute(); + protected PersistentAttribute2_0 getJavaPersistentAttribute2_0() { + return (PersistentAttribute2_0) this.getJavaPersistentAttribute(); } protected JavaPersistentAttribute buildAnnotatedJavaAttribute() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java index f8b945aee9..c0138903c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaNamedDiscriminatorColumn.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.DiscriminatorType; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.NamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorColumnAnnotation; */ public abstract class AbstractJavaNamedDiscriminatorColumn<A extends DiscriminatorColumnAnnotation, O extends ReadOnlyNamedDiscriminatorColumn.Owner> extends AbstractJavaNamedColumn<A, O> - implements JavaNamedDiscriminatorColumn + implements NamedDiscriminatorColumn { protected DiscriminatorType specifiedDiscriminatorType; protected DiscriminatorType defaultDiscriminatorType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index b66b83fac3..502ad2e192 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java @@ -35,7 +35,6 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.VirtualOverride; import org.eclipse.jpt.jpa.core.context.java.JavaOverride; import org.eclipse.jpt.jpa.core.context.java.JavaOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverride; import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -64,7 +63,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaOverrideContainer< O extends JavaOverrideContainer.Owner, - R extends JavaReadOnlyOverride, + R extends ReadOnlyOverride, S extends JavaOverride, V extends JavaVirtualOverride, A extends OverrideAnnotation & NestableAnnotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java index cfd52e78e9..8a01b750ea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAssociationOverrideContainer.java @@ -18,7 +18,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -31,7 +30,7 @@ import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; public class GenericJavaAssociationOverrideContainer extends AbstractJavaOverrideContainer< JavaAssociationOverrideContainer.Owner, - JavaReadOnlyAssociationOverride, + ReadOnlyAssociationOverride, JavaAssociationOverride, JavaVirtualAssociationOverride, AssociationOverrideAnnotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverrideContainer.java index a2067ac05a..8a59ca3f7c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaAttributeOverrideContainer.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAttributeOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; public class GenericJavaAttributeOverrideContainer extends AbstractJavaOverrideContainer< JavaAttributeOverrideContainer.Owner, - JavaReadOnlyAttributeOverride, + ReadOnlyAttributeOverride, JavaAttributeOverride, JavaVirtualAttributeOverride, AttributeOverrideAnnotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java index 408252677e..dfee27bef7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaCascade.java @@ -13,13 +13,13 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaRelationshipMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.RelationshipMapping2_0Annotation; import org.eclipse.jpt.jpa.core.resource.java.RelationshipMappingAnnotation; public class GenericJavaCascade extends AbstractJavaJpaContextNode - implements JavaCascade2_0 + implements Cascade2_0 { protected boolean all; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java index e123367631..0c7dc1abf2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaEntity.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2010 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -14,7 +14,6 @@ import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaEntity; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; @@ -22,7 +21,7 @@ public class GenericJavaEntity extends AbstractJavaEntity { // EclipseLink holds its cacheable in its caching - protected final JavaCacheable2_0 cacheable; + protected final Cacheable2_0 cacheable; public GenericJavaEntity(JavaPersistentType parent, EntityAnnotation mappingAnnotation) { @@ -48,11 +47,11 @@ public class GenericJavaEntity // ********** cacheable ********** - public JavaCacheable2_0 getCacheable() { + public Cacheable2_0 getCacheable() { return this.cacheable; } - protected JavaCacheable2_0 buildCacheable() { + protected Cacheable2_0 buildCacheable() { return this.isJpa2_0Compatible() ? this.getJpaFactory2_0().buildJavaCacheable(this) : new NullJavaCacheable2_0(this); 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 fe633db1cf..fe6dd88d33 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 @@ -22,12 +22,12 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +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.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaRelationship; 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.resource.java.NullJoinColumnAnnotation; @@ -364,7 +364,7 @@ public class GenericJavaJoinTable return GenericJavaJoinTable.this.getValidationTextRange(); } - protected JavaRelationship getRelationship() { + protected Relationship getRelationship() { return this.getRelationshipStrategy().getRelationship(); } 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 a0d566ce93..dc6fe34195 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 @@ -23,13 +23,13 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.InverseJoinColumnValidator import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinTableTableDescriptionProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.JoinTableValidator; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; public class GenericJavaMappingJoinTableRelationshipStrategy extends AbstractJavaJoinTableRelationshipStrategy - implements JavaMappingJoinTableRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0 { public GenericJavaMappingJoinTableRelationshipStrategy(JavaMappingJoinTableRelationship 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 2050331a80..965bd3c2fc 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 @@ -15,7 +15,6 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.jpa2.context.OrderColumnValidator; @@ -313,7 +312,7 @@ public class GenericJavaOrderable } protected JavaOrderColumn2_0 buildOrderColumn() { - JavaReadOnlyNamedColumn.Owner columnOwner = new OrderColumnOwner(); + ReadOnlyNamedColumn.Owner columnOwner = new OrderColumnOwner(); return this.isJpa2_0Compatible() ? this.getJpaFactory2_0().buildJavaOrderColumn(this, columnOwner) : new GenericJavaOrderColumn2_0(this, columnOwner); @@ -447,7 +446,7 @@ public class GenericJavaOrderable // ********** order column owner (JPA 2.0) ********** protected class OrderColumnOwner - implements JavaReadOnlyNamedColumn.Owner + implements ReadOnlyNamedColumn.Owner { public String getDefaultTableName() { return GenericJavaOrderable.this.getDefaultTableName(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java index 8ee8605110..65040835c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaOverrideRelationship.java @@ -24,11 +24,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyOverrideRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.context.java.GenericJavaOverrideJoinColumnRelationshipStrategy; @@ -45,7 +45,7 @@ public class GenericJavaOverrideRelationship extends AbstractJavaJpaContextNode implements JavaOverrideRelationship2_0 { - protected JavaRelationshipStrategy strategy; + protected RelationshipStrategy strategy; protected final JavaJoinColumnRelationshipStrategy joinColumnStrategy; @@ -80,17 +80,17 @@ public class GenericJavaOverrideRelationship // ********** strategy ********** - public JavaRelationshipStrategy getStrategy() { + public RelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(JavaRelationshipStrategy strategy) { - JavaRelationshipStrategy old = this.strategy; + protected void setStrategy(RelationshipStrategy strategy) { + RelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected JavaRelationshipStrategy buildStrategy() { + protected RelationshipStrategy buildStrategy() { return this.isJpa2_0Compatible() ? this.buildStrategy2_0() : this.joinColumnStrategy; @@ -99,10 +99,10 @@ public class GenericJavaOverrideRelationship /** * The overridden mapping determines the override's strategy. */ - protected JavaRelationshipStrategy buildStrategy2_0() { + protected RelationshipStrategy buildStrategy2_0() { MappingRelationshipStrategy2_0 mappingStrategy = this.getMappingStrategy(); return (mappingStrategy != null) ? - (JavaRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : + (RelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : this.buildMissingMappingStrategy(); } @@ -118,7 +118,7 @@ public class GenericJavaOverrideRelationship * Return the strategy to use when the override's name does not match the * name of an appropriate relationship mapping. */ - protected JavaRelationshipStrategy buildMissingMappingStrategy() { + protected RelationshipStrategy buildMissingMappingStrategy() { return this.joinColumnStrategy.hasSpecifiedJoinColumns() ? this.joinColumnStrategy : this.joinTableStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java index d0a88fe697..0da18fa850 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAssociationOverride.java @@ -14,13 +14,14 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAssociationOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualOverride; +import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAssociationOverrideContainer2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaVirtualAssociationOverride2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -29,9 +30,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericJavaVirtualAssociationOverride extends AbstractJavaVirtualOverride<JavaAssociationOverrideContainer> - implements JavaVirtualAssociationOverride2_0 + implements JavaVirtualAssociationOverride, ReadOnlyAssociationOverride2_0 { - protected final JavaVirtualOverrideRelationship relationship; + protected final VirtualOverrideRelationship relationship; public GenericJavaVirtualAssociationOverride(JavaAssociationOverrideContainer parent, String name) { @@ -61,7 +62,7 @@ public class GenericJavaVirtualAssociationOverride // ********** relationship ********** - public JavaVirtualOverrideRelationship getRelationship() { + public VirtualOverrideRelationship getRelationship() { return this.relationship; } @@ -69,7 +70,7 @@ public class GenericJavaVirtualAssociationOverride * The relationship should be available (since its presence precipitated the * creation of the virtual override). */ - protected JavaVirtualOverrideRelationship buildRelationship() { + protected VirtualOverrideRelationship buildRelationship() { return this.getJpaFactory().buildJavaVirtualOverrideRelationship(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java index 76ede6942a..d6b82dd1e7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualAttributeOverride.java @@ -13,10 +13,10 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverride; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualColumn; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualOverride; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -27,9 +27,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericJavaVirtualAttributeOverride extends AbstractJavaVirtualOverride<JavaAttributeOverrideContainer> - implements JavaVirtualAttributeOverride, JavaVirtualColumn.Owner + implements JavaVirtualAttributeOverride, VirtualColumn.Owner { - protected final JavaVirtualColumn column; + protected final VirtualColumn column; public GenericJavaVirtualAttributeOverride(JavaAttributeOverrideContainer parent, String name) { @@ -51,7 +51,7 @@ public class GenericJavaVirtualAttributeOverride // ********** column ********** - public JavaVirtualColumn getColumn() { + public VirtualColumn getColumn() { return this.column; } @@ -59,7 +59,7 @@ public class GenericJavaVirtualAttributeOverride * The original column should be available (since the presence of its * attribute is what precipitated the creation of the virtual override). */ - protected JavaVirtualColumn buildColumn() { + protected VirtualColumn buildColumn() { return this.getJpaFactory().buildJavaVirtualColumn(this, this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualColumn.java index 7148bfc110..fceab74e6f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualColumn.java @@ -11,15 +11,15 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualBaseColumn; /** * Java virtual column */ public class GenericJavaVirtualColumn - extends AbstractJavaVirtualBaseColumn<JavaVirtualColumn.Owner, ReadOnlyColumn> - implements JavaVirtualColumn + extends AbstractJavaVirtualBaseColumn<VirtualColumn.Owner, ReadOnlyColumn> + implements VirtualColumn { protected Integer specifiedLength; protected int defaultLength; @@ -31,7 +31,7 @@ public class GenericJavaVirtualColumn protected int defaultScale; - public GenericJavaVirtualColumn(JpaContextNode parent, JavaVirtualColumn.Owner owner) { + public GenericJavaVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner) { super(parent, owner); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java index be6d619910..f46658de19 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualJoinColumn.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaVirtualBaseColumn; import org.eclipse.jpt.jpa.db.Column; @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.db.Table; */ public class GenericJavaVirtualJoinColumn extends AbstractJavaVirtualBaseColumn<ReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> - implements JavaVirtualJoinColumn + implements VirtualJoinColumn { protected final ReadOnlyJoinColumn overriddenColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java index 4de05f67a5..be58026ddb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java @@ -25,9 +25,9 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumnRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; 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.context.java.AbstractJavaJpaContextNode; @@ -37,15 +37,15 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy extends AbstractJavaJpaContextNode - implements JavaVirtualJoinColumnRelationshipStrategy + implements VirtualJoinColumnRelationshipStrategy { - protected final ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; + protected final ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> specifiedJoinColumnContainer; protected final ReadOnlyJoinColumn.Owner joinColumnOwner; - protected JavaVirtualJoinColumn defaultJoinColumn; + protected VirtualJoinColumn defaultJoinColumn; - public GenericJavaVirtualOverrideJoinColumnRelationshipStrategy(JavaVirtualOverrideRelationship parent) { + public GenericJavaVirtualOverrideJoinColumnRelationshipStrategy(VirtualOverrideRelationship parent) { super(parent); this.joinColumnOwner = this.buildJoinColumnOwner(); this.specifiedJoinColumnContainer = this.buildSpecifiedJoinColumnContainer(); @@ -64,7 +64,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy // ********** join columns ********** - public ListIterable<JavaVirtualJoinColumn> getJoinColumns() { + public ListIterable<VirtualJoinColumn> getJoinColumns() { return this.hasSpecifiedJoinColumns() ? this.getSpecifiedJoinColumns() : this.getDefaultJoinColumns(); } @@ -75,7 +75,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy // ********** specified join columns ********** - public ListIterable<JavaVirtualJoinColumn> getSpecifiedJoinColumns() { + public ListIterable<VirtualJoinColumn> getSpecifiedJoinColumns() { return this.specifiedJoinColumnContainer.getContextElements(); } @@ -87,7 +87,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return this.getSpecifiedJoinColumnsSize() != 0; } - public JavaVirtualJoinColumn getSpecifiedJoinColumn(int index) { + public VirtualJoinColumn getSpecifiedJoinColumn(int index) { return this.specifiedJoinColumnContainer.getContextElement(index); } @@ -106,14 +106,14 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy * specified join column container */ protected class SpecifiedJoinColumnContainer - extends ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> + extends ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> { @Override protected String getContextElementsPropertyName() { return SPECIFIED_JOIN_COLUMNS_LIST; } @Override - protected JavaVirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { + protected VirtualJoinColumn buildContextElement(ReadOnlyJoinColumn resourceElement) { return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.buildJoinColumn(resourceElement); } @Override @@ -121,7 +121,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.this.getOverriddenSpecifiedJoinColumns(); } @Override - protected ReadOnlyJoinColumn getResourceElement(JavaVirtualJoinColumn contextElement) { + protected ReadOnlyJoinColumn getResourceElement(VirtualJoinColumn contextElement) { return contextElement.getOverriddenColumn(); } } @@ -130,27 +130,27 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return new JoinColumnOwner(); } - protected ContextListContainer<JavaVirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer(){ + protected ContextListContainer<VirtualJoinColumn, ReadOnlyJoinColumn> buildSpecifiedJoinColumnContainer(){ return new SpecifiedJoinColumnContainer(); } // ********** default join column ********** - public JavaVirtualJoinColumn getDefaultJoinColumn() { + public VirtualJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(JavaVirtualJoinColumn joinColumn) { - JavaVirtualJoinColumn old = this.defaultJoinColumn; + protected void setDefaultJoinColumn(VirtualJoinColumn joinColumn) { + VirtualJoinColumn old = this.defaultJoinColumn; this.defaultJoinColumn = joinColumn; this.firePropertyChanged(DEFAULT_JOIN_COLUMN_PROPERTY, old, joinColumn); } - protected ListIterable<JavaVirtualJoinColumn> getDefaultJoinColumns() { + protected ListIterable<VirtualJoinColumn> getDefaultJoinColumns() { return (this.defaultJoinColumn != null) ? - new SingleElementListIterable<JavaVirtualJoinColumn>(this.defaultJoinColumn) : - EmptyListIterable.<JavaVirtualJoinColumn>instance(); + new SingleElementListIterable<VirtualJoinColumn>(this.defaultJoinColumn) : + EmptyListIterable.<VirtualJoinColumn>instance(); } protected int getDefaultJoinColumnsSize() { @@ -181,11 +181,11 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy // ********** misc ********** @Override - public JavaVirtualOverrideRelationship getParent() { - return (JavaVirtualOverrideRelationship) super.getParent(); + public VirtualOverrideRelationship getParent() { + return (VirtualOverrideRelationship) super.getParent(); } - public JavaVirtualOverrideRelationship getRelationship() { + public VirtualOverrideRelationship getRelationship() { return this.getParent(); } @@ -294,7 +294,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy return this.getRelationship().getAttributeName(); } - protected JavaVirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn overriddenJoinColumn) { + protected VirtualJoinColumn buildJoinColumn(ReadOnlyJoinColumn overriddenJoinColumn) { return this.getJpaFactory().buildJavaVirtualJoinColumn(this, this.joinColumnOwner, overriddenJoinColumn); } @@ -304,7 +304,7 @@ public class GenericJavaVirtualOverrideJoinColumnRelationshipStrategy @Override public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - for (JavaVirtualJoinColumn joinColumn : this.getJoinColumns()) { + for (VirtualJoinColumn joinColumn : this.getJoinColumns()) { joinColumn.validate(messages, reporter); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java index f0d8c9f3ec..1dd0b8bc1c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideRelationship.java @@ -21,30 +21,30 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; 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.VirtualJoinColumnRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaVirtualOverrideRelationship2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaVirtualOverrideRelationship extends AbstractJavaJpaContextNode - implements JavaVirtualOverrideRelationship2_0 + implements VirtualOverrideRelationship2_0 { - protected JavaVirtualRelationshipStrategy strategy; + protected VirtualRelationshipStrategy strategy; - protected final JavaVirtualJoinColumnRelationshipStrategy joinColumnStrategy; + protected final VirtualJoinColumnRelationshipStrategy joinColumnStrategy; // JPA 2.0 - protected final JavaVirtualJoinTableRelationshipStrategy joinTableStrategy; + protected final VirtualJoinTableRelationshipStrategy joinTableStrategy; public GenericJavaVirtualOverrideRelationship(JavaVirtualAssociationOverride parent) { @@ -67,17 +67,17 @@ public class GenericJavaVirtualOverrideRelationship // ********** strategy ********** - public JavaVirtualRelationshipStrategy getStrategy() { + public VirtualRelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(JavaVirtualRelationshipStrategy strategy) { - JavaVirtualRelationshipStrategy old = this.strategy; + protected void setStrategy(VirtualRelationshipStrategy strategy) { + VirtualRelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected JavaVirtualRelationshipStrategy buildStrategy() { + protected VirtualRelationshipStrategy buildStrategy() { return this.isJpa2_0Compatible() ? this.buildStrategy2_0() : this.joinColumnStrategy; @@ -86,10 +86,10 @@ public class GenericJavaVirtualOverrideRelationship /** * The overridden mapping determines the override's strategy. */ - protected JavaVirtualRelationshipStrategy buildStrategy2_0() { + protected VirtualRelationshipStrategy buildStrategy2_0() { MappingRelationshipStrategy2_0 mappingStrategy = this.getMappingStrategy(); return (mappingStrategy != null) ? - (JavaVirtualRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : + (VirtualRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : this.buildMissingMappingStrategy(); } @@ -105,7 +105,7 @@ public class GenericJavaVirtualOverrideRelationship * Return the strategy to use when the override's name does not match the * name of an appropriate relationship mapping. */ - protected JavaVirtualRelationshipStrategy buildMissingMappingStrategy() { + protected VirtualRelationshipStrategy buildMissingMappingStrategy() { return this.joinColumnStrategy.hasSpecifiedJoinColumns() ? this.joinColumnStrategy : this.joinTableStrategy; @@ -114,7 +114,7 @@ public class GenericJavaVirtualOverrideRelationship // ********** join column strategy ********** - public JavaVirtualJoinColumnRelationshipStrategy getJoinColumnStrategy() { + public VirtualJoinColumnRelationshipStrategy getJoinColumnStrategy() { return this.joinColumnStrategy; } @@ -127,14 +127,14 @@ public class GenericJavaVirtualOverrideRelationship return false; } - protected JavaVirtualJoinColumnRelationshipStrategy buildJoinColumnStrategy() { + protected VirtualJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericJavaVirtualOverrideJoinColumnRelationshipStrategy(this); } // ********** join table strategy ********** - public JavaVirtualJoinTableRelationshipStrategy getJoinTableStrategy() { + public VirtualJoinTableRelationshipStrategy getJoinTableStrategy() { return this.joinTableStrategy; } @@ -147,7 +147,7 @@ public class GenericJavaVirtualOverrideRelationship return false; } - protected JavaVirtualJoinTableRelationshipStrategy buildJoinTableStrategy() { + protected VirtualJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java index 3e67e7c98d..f458eecf96 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualUniqueConstraint.java @@ -12,12 +12,12 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaReadOnlyUniqueConstraint; public class GenericJavaVirtualUniqueConstraint extends AbstractJavaReadOnlyUniqueConstraint - implements JavaVirtualUniqueConstraint + implements VirtualUniqueConstraint { protected final ReadOnlyUniqueConstraint overriddenUniqueConstraint; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java index 301ec25716..cebf635860 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java @@ -19,9 +19,10 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationship; +import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.db.Table; /** @@ -31,7 +32,7 @@ import org.eclipse.jpt.jpa.db.Table; */ public class NullJavaJoinColumnRelationshipStrategy extends AbstractJavaJpaContextNode - implements JavaMappingJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, JavaJoinColumnRelationshipStrategy { public NullJavaJoinColumnRelationshipStrategy(JavaJoinColumnRelationship parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java index abbe86491b..7290af31b5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinTableRelationshipStrategy.java @@ -15,16 +15,17 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTable; import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationship; +import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMappingJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; import org.eclipse.jpt.jpa.db.Table; public class NullJavaJoinTableRelationshipStrategy extends AbstractJavaJpaContextNode - implements JavaMappingJoinTableRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, JavaJoinTableRelationshipStrategy { public NullJavaJoinTableRelationshipStrategy(JavaJoinTableRelationship parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java index 7381b6991d..09fe27beff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmNamedDiscriminatorColumn.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.context.DiscriminatorType; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.NamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmNamedDiscriminatorColumn; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn; import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseDiscriminatorColumn; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlBaseDiscriminatorColumn; */ public abstract class AbstractOrmNamedDiscriminatorColumn<X extends XmlBaseDiscriminatorColumn, O extends ReadOnlyNamedDiscriminatorColumn.Owner> extends AbstractOrmNamedColumn<X, O> - implements OrmNamedDiscriminatorColumn + implements NamedDiscriminatorColumn { protected DiscriminatorType specifiedDiscriminatorType; protected DiscriminatorType defaultDiscriminatorType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index 52ee061f2e..c2d7d577d0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -26,7 +26,6 @@ import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.VirtualOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverride; import org.eclipse.jpt.jpa.core.internal.context.ContextContainerTools; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -40,7 +39,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractOrmOverrideContainer< O extends OrmOverrideContainer.Owner, - R extends OrmReadOnlyOverride, + R extends ReadOnlyOverride, S extends OrmOverride, V extends OrmVirtualOverride, X extends XmlOverride diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java index a6af231411..e3f21c9e4a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java @@ -18,7 +18,6 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; @@ -32,7 +31,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; public class GenericOrmAssociationOverrideContainer extends AbstractOrmOverrideContainer< OrmAssociationOverrideContainer.Owner, - OrmReadOnlyAssociationOverride, + ReadOnlyAssociationOverride, OrmAssociationOverride, OrmVirtualAssociationOverride, XmlAssociationOverride diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java index 011a967fbe..fdb170e5c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride; @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeOverride; public class GenericOrmAttributeOverrideContainer extends AbstractOrmOverrideContainer< OrmAttributeOverrideContainer.Owner, - OrmReadOnlyAttributeOverride, + ReadOnlyAttributeOverride, OrmAttributeOverride, OrmVirtualAttributeOverride, XmlAttributeOverride diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java index eeb2a12a30..87928a926d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmBaseTemporalConverter.java @@ -15,7 +15,6 @@ import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.TemporalType; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; public class GenericOrmBaseTemporalConverter extends AbstractOrmConverter @@ -23,14 +22,14 @@ public class GenericOrmBaseTemporalConverter { protected TemporalType temporalType; - public GenericOrmBaseTemporalConverter(OrmAttributeMapping parent, OrmTemporalConverter.Owner owner) { + public GenericOrmBaseTemporalConverter(OrmAttributeMapping parent, OrmBaseTemporalConverter.Owner owner) { super(parent, owner); this.temporalType = this.buildTemporalType(); } @Override - protected OrmTemporalConverter.Owner getOwner() { - return (OrmTemporalConverter.Owner) super.getOwner(); + protected OrmBaseTemporalConverter.Owner getOwner() { + return (OrmBaseTemporalConverter.Owner) super.getOwner(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java index 76cba3a5c8..b804b9cb75 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmCascade.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,18 +11,18 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.core.context.orm.OrmCascade; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCascade2_0; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlRelationshipMapping; import org.eclipse.jpt.jpa.core.resource.orm.CascadeType; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; public class GenericOrmCascade extends AbstractOrmXmlContextNode - implements OrmCascade2_0 + implements OrmCascade, Cascade2_0 { protected boolean all; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java index 839ccc846d..d09a2d338d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmEntity.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 Oracle. All rights reserved. + * Copyright (c) 2006, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -14,7 +14,6 @@ import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmEntity; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.NullOrmCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntity; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0; @@ -23,7 +22,7 @@ public class GenericOrmEntity extends AbstractOrmEntity<XmlEntity> { // EclipseLink holds its cacheable in its caching - protected final OrmCacheable2_0 cacheable; + protected final Cacheable2_0 cacheable; public GenericOrmEntity(OrmPersistentType parent, XmlEntity xmlEntity) { @@ -49,11 +48,11 @@ public class GenericOrmEntity // ********** cacheable ********** - public OrmCacheable2_0 getCacheable() { + public Cacheable2_0 getCacheable() { return this.cacheable; } - protected OrmCacheable2_0 buildCacheable() { + protected Cacheable2_0 buildCacheable() { return this.isOrmXml2_0Compatible() ? this.getContextNodeFactory2_0().buildOrmCacheable(this) : new NullOrmCacheable2_0(this); 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 8742ac68b3..d68e7aba25 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 @@ -23,12 +23,12 @@ import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +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.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTable; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmRelationship; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.resource.orm.XmlJoinColumn; @@ -370,7 +370,7 @@ public class GenericOrmJoinTable return GenericOrmJoinTable.this.getValidationTextRange(); } - protected OrmRelationship getRelationship() { + protected Relationship getRelationship() { return this.getRelationshipStrategy().getRelationship(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java index 785a544f5f..c893406576 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmOverrideRelationship.java @@ -24,11 +24,11 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn.Owner; import org.eclipse.jpt.jpa.core.context.Relationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.RelationshipStrategy; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.internal.context.orm.GenericOrmOverrideJoinColumnRelationshipStrategy; @@ -46,7 +46,7 @@ public class GenericOrmOverrideRelationship extends AbstractOrmXmlContextNode implements OrmOverrideRelationship2_0 { - protected OrmRelationshipStrategy strategy; + protected RelationshipStrategy strategy; protected final OrmJoinColumnRelationshipStrategy joinColumnStrategy; @@ -81,17 +81,17 @@ public class GenericOrmOverrideRelationship // ********** strategy ********** - public OrmRelationshipStrategy getStrategy() { + public RelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(OrmRelationshipStrategy strategy) { - OrmRelationshipStrategy old = this.strategy; + protected void setStrategy(RelationshipStrategy strategy) { + RelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected OrmRelationshipStrategy buildStrategy() { + protected RelationshipStrategy buildStrategy() { return this.isJpa2_0Compatible() ? this.buildStrategy2_0() : this.joinColumnStrategy; @@ -100,10 +100,10 @@ public class GenericOrmOverrideRelationship /** * The overridden mapping determines the override's strategy. */ - protected OrmRelationshipStrategy buildStrategy2_0() { + protected RelationshipStrategy buildStrategy2_0() { MappingRelationshipStrategy2_0 mappingStrategy = this.getMappingStrategy(); return (mappingStrategy != null) ? - (OrmRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : + (RelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : this.buildMissingMappingStrategy(); } @@ -119,7 +119,7 @@ public class GenericOrmOverrideRelationship * Return the strategy to use when the override's name does not match the * name of an appropriate relationship mapping. */ - protected OrmRelationshipStrategy buildMissingMappingStrategy() { + protected RelationshipStrategy buildMissingMappingStrategy() { return this.joinColumnStrategy.hasSpecifiedJoinColumns() ? this.joinColumnStrategy : this.joinTableStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java index a549c171d2..423cebe353 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAssociationOverride.java @@ -14,12 +14,13 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.jpt.jpa.core.context.VirtualOverrideRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; +import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmVirtualAssociationOverride2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -28,9 +29,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericOrmVirtualAssociationOverride extends AbstractOrmVirtualOverride<OrmAssociationOverrideContainer> - implements OrmVirtualAssociationOverride2_0 + implements OrmVirtualAssociationOverride, ReadOnlyAssociationOverride2_0 { - protected final OrmVirtualOverrideRelationship relationship; + protected final VirtualOverrideRelationship relationship; public GenericOrmVirtualAssociationOverride(OrmAssociationOverrideContainer parent, String name) { @@ -60,7 +61,7 @@ public class GenericOrmVirtualAssociationOverride // ********** relationship ********** - public OrmVirtualOverrideRelationship getRelationship() { + public VirtualOverrideRelationship getRelationship() { return this.relationship; } @@ -68,7 +69,7 @@ public class GenericOrmVirtualAssociationOverride * The relationship should be available (since its presence precipitated the * creation of the virtual override). */ - protected OrmVirtualOverrideRelationship buildRelationship() { + protected VirtualOverrideRelationship buildRelationship() { return this.getContextNodeFactory().buildOrmVirtualOverrideRelationship(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java index e9e188e5f5..b101f19071 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualAttributeOverride.java @@ -13,10 +13,10 @@ import java.util.List; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverride; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAttributeOverride; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualColumn; 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; @@ -26,9 +26,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public class GenericOrmVirtualAttributeOverride extends AbstractOrmVirtualOverride<OrmAttributeOverrideContainer> - implements OrmVirtualAttributeOverride, OrmVirtualColumn.Owner + implements OrmVirtualAttributeOverride, VirtualColumn.Owner { - protected final OrmVirtualColumn column; + protected final VirtualColumn column; public GenericOrmVirtualAttributeOverride(OrmAttributeOverrideContainer parent, String name) { @@ -50,7 +50,7 @@ public class GenericOrmVirtualAttributeOverride // ********** column ********** - public OrmVirtualColumn getColumn() { + public VirtualColumn getColumn() { return this.column; } @@ -58,7 +58,7 @@ public class GenericOrmVirtualAttributeOverride * The original column should be available (since the presence of its * attribute is what precipitated the creation of the virtual override). */ - protected OrmVirtualColumn buildColumn() { + protected VirtualColumn buildColumn() { return this.getContextNodeFactory().buildOrmVirtualColumn(this, this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualColumn.java index e66d462689..e51831a29a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualColumn.java @@ -11,15 +11,15 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualColumn; +import org.eclipse.jpt.jpa.core.context.VirtualColumn; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVirtualBaseColumn; /** * <code>orm.xml</code> virtual column */ public class GenericOrmVirtualColumn - extends AbstractOrmVirtualBaseColumn<OrmVirtualColumn.Owner, ReadOnlyColumn> - implements OrmVirtualColumn + extends AbstractOrmVirtualBaseColumn<VirtualColumn.Owner, ReadOnlyColumn> + implements VirtualColumn { protected Integer specifiedLength; protected int defaultLength; @@ -31,7 +31,7 @@ public class GenericOrmVirtualColumn protected int defaultScale; - public GenericOrmVirtualColumn(JpaContextNode parent, OrmVirtualColumn.Owner owner) { + public GenericOrmVirtualColumn(JpaContextNode parent, VirtualColumn.Owner owner) { super(parent, owner); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java index 6ed1f3df2d..2499c73115 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualJoinColumn.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumn; +import org.eclipse.jpt.jpa.core.context.VirtualJoinColumn; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmVirtualBaseColumn; import org.eclipse.jpt.jpa.db.Column; @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.db.Table; */ public class GenericOrmVirtualJoinColumn extends AbstractOrmVirtualBaseColumn<ReadOnlyJoinColumn.Owner, ReadOnlyJoinColumn> - implements OrmVirtualJoinColumn + implements VirtualJoinColumn { protected final ReadOnlyJoinColumn overriddenColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java index ee60d5f28c..a7316621a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualOverrideRelationship.java @@ -21,31 +21,31 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; 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.VirtualJoinColumnRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinColumnRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; import org.eclipse.jpt.jpa.core.internal.context.orm.GenericOrmVirtualOverrideJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmVirtualOverrideRelationship2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.jpt.jpa.db.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericOrmVirtualOverrideRelationship extends AbstractOrmXmlContextNode - implements OrmVirtualOverrideRelationship2_0 + implements VirtualOverrideRelationship2_0 { - protected OrmVirtualRelationshipStrategy strategy; + protected VirtualRelationshipStrategy strategy; - protected final OrmVirtualJoinColumnRelationshipStrategy joinColumnStrategy; + protected final VirtualJoinColumnRelationshipStrategy joinColumnStrategy; // JPA 2.0 - protected final OrmVirtualJoinTableRelationshipStrategy joinTableStrategy; + protected final VirtualJoinTableRelationshipStrategy joinTableStrategy; public GenericOrmVirtualOverrideRelationship(OrmVirtualAssociationOverride parent) { @@ -68,17 +68,17 @@ public class GenericOrmVirtualOverrideRelationship // ********** strategy ********** - public OrmVirtualRelationshipStrategy getStrategy() { + public VirtualRelationshipStrategy getStrategy() { return this.strategy; } - protected void setStrategy(OrmVirtualRelationshipStrategy strategy) { - OrmVirtualRelationshipStrategy old = this.strategy; + protected void setStrategy(VirtualRelationshipStrategy strategy) { + VirtualRelationshipStrategy old = this.strategy; this.strategy = strategy; this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); } - protected OrmVirtualRelationshipStrategy buildStrategy() { + protected VirtualRelationshipStrategy buildStrategy() { return this.isJpa2_0Compatible() ? this.buildStrategy2_0() : this.joinColumnStrategy; @@ -87,10 +87,10 @@ public class GenericOrmVirtualOverrideRelationship /** * The overridden mapping determines the override's strategy. */ - protected OrmVirtualRelationshipStrategy buildStrategy2_0() { + protected VirtualRelationshipStrategy buildStrategy2_0() { MappingRelationshipStrategy2_0 mappingStrategy = this.getMappingStrategy(); return (mappingStrategy != null) ? - (OrmVirtualRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : + (VirtualRelationshipStrategy) mappingStrategy.selectOverrideStrategy(this) : this.buildMissingMappingStrategy(); } @@ -106,7 +106,7 @@ public class GenericOrmVirtualOverrideRelationship * Return the strategy to use when the override's name does not match the * name of an appropriate relationship mapping. */ - protected OrmVirtualRelationshipStrategy buildMissingMappingStrategy() { + protected VirtualRelationshipStrategy buildMissingMappingStrategy() { return this.joinColumnStrategy.hasSpecifiedJoinColumns() ? this.joinColumnStrategy : this.joinTableStrategy; @@ -115,7 +115,7 @@ public class GenericOrmVirtualOverrideRelationship // ********** join column strategy ********** - public OrmVirtualJoinColumnRelationshipStrategy getJoinColumnStrategy() { + public VirtualJoinColumnRelationshipStrategy getJoinColumnStrategy() { return this.joinColumnStrategy; } @@ -128,14 +128,14 @@ public class GenericOrmVirtualOverrideRelationship return false; } - protected OrmVirtualJoinColumnRelationshipStrategy buildJoinColumnStrategy() { + protected VirtualJoinColumnRelationshipStrategy buildJoinColumnStrategy() { return new GenericOrmVirtualOverrideJoinColumnRelationshipStrategy(this); } // ********** join table strategy ********** - public OrmVirtualJoinTableRelationshipStrategy getJoinTableStrategy() { + public VirtualJoinTableRelationshipStrategy getJoinTableStrategy() { return this.joinTableStrategy; } @@ -148,7 +148,7 @@ public class GenericOrmVirtualOverrideRelationship return false; } - protected OrmVirtualJoinTableRelationshipStrategy buildJoinTableStrategy() { + protected VirtualJoinTableRelationshipStrategy buildJoinTableStrategy() { return new GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualUniqueConstraint.java index 2a80237953..271f096df2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmVirtualUniqueConstraint.java @@ -12,12 +12,12 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualUniqueConstraint; +import org.eclipse.jpt.jpa.core.context.VirtualUniqueConstraint; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmReadOnlyUniqueConstraint; public class GenericOrmVirtualUniqueConstraint extends AbstractOrmReadOnlyUniqueConstraint - implements OrmVirtualUniqueConstraint + implements VirtualUniqueConstraint { protected final ReadOnlyUniqueConstraint overriddenUniqueConstraint; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java index e783742082..550d4078ac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -19,9 +19,10 @@ import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; +import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyOverrideRelationship2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMappingJoinColumnRelationshipStrategy2_0; import org.eclipse.jpt.jpa.db.Table; /** @@ -31,7 +32,7 @@ import org.eclipse.jpt.jpa.db.Table; */ public class NullOrmJoinColumnRelationshipStrategy extends AbstractOrmXmlContextNode - implements OrmMappingJoinColumnRelationshipStrategy2_0 + implements MappingRelationshipStrategy2_0, OrmJoinColumnRelationshipStrategy { public NullOrmJoinColumnRelationshipStrategy(OrmJoinColumnRelationship parent) { super(parent); 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 298646986f..597afc3344 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 @@ -14,7 +14,9 @@ import org.eclipse.jpt.jpa.core.JpaDataSource; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProject.Config; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.PersistentType; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; 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; @@ -22,11 +24,9 @@ import org.eclipse.jpt.jpa.core.context.java.JavaColumn; 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.JavaNamedQuery; -import org.eclipse.jpt.jpa.core.context.java.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaQueryContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; import org.eclipse.jpt.jpa.core.internal.AbstractJpaFactory; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaAssociationOverrideContainer; @@ -44,9 +44,11 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaPersistent import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaSequenceGenerator2_0; import org.eclipse.jpt.jpa.core.jpa2.JpaFactory2_0; import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0; +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.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0.Owner; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionTable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; @@ -54,8 +56,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEmbeddedMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.NamedQuery2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.SequenceGenerator2_0Annotation; @@ -128,11 +128,11 @@ public class GenericJpaFactory2_0 return new GenericJavaElementCollectionMapping2_0(parent); } - public JavaCacheable2_0 buildJavaCacheable(JavaCacheableHolder2_0 parent) { + public Cacheable2_0 buildJavaCacheable(JavaCacheableHolder2_0 parent) { return new GenericJavaCacheable2_0(parent); } - public JavaOrphanRemovable2_0 buildJavaOrphanRemoval(JavaOrphanRemovalHolder2_0 parent) { + public OrphanRemovable2_0 buildJavaOrphanRemoval(OrphanRemovalHolder2_0 parent) { return new GenericJavaOrphanRemoval2_0(parent); } @@ -145,7 +145,7 @@ public class GenericJpaFactory2_0 return new GenericJavaCollectionTable2_0(parent, owner); } - public JavaOrderColumn2_0 buildJavaOrderColumn(JavaOrderable2_0 parent, JavaReadOnlyNamedColumn.Owner owner) { + public JavaOrderColumn2_0 buildJavaOrderColumn(JavaOrderable2_0 parent, ReadOnlyNamedColumn.Owner owner) { return new GenericJavaOrderColumn2_0(parent, owner); } @@ -158,7 +158,7 @@ public class GenericJpaFactory2_0 } @Override - public JavaOrderable buildJavaOrderable(JavaAttributeMapping parent) { + public Orderable buildJavaOrderable(JavaAttributeMapping parent) { throw new UnsupportedOperationException(); } } 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 76c7dae3b4..517a490c42 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 @@ -60,13 +60,13 @@ import org.eclipse.jpt.jpa.core.context.Table; 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.JavaBaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaLobConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaTemporalConverter; 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; @@ -94,14 +94,12 @@ 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.PersistentAttribute2_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; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapKeyEnumeratedConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapKeyTemporalConverter2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollection2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; @@ -160,16 +158,16 @@ public abstract class AbstractJavaElementCollectionMapping2_0 protected JavaJoinColumn defaultMapKeyJoinColumn; protected static final JavaConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaEnumeratedConverter.Adapter.instance(), - JavaTemporalConverter.ElementCollectionAdapter.instance(), + JavaBaseEnumeratedConverter.BasicAdapter.instance(), + JavaBaseTemporalConverter.ElementCollectionAdapter.instance(), JavaLobConverter.Adapter.instance() }; protected static final Iterable<JavaConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); protected static final JavaConverter.Adapter[] MAP_KEY_CONVERTER_ADAPTER_ARRAY = new JavaConverter.Adapter[] { - JavaMapKeyEnumeratedConverter2_0.Adapter.instance(), - JavaMapKeyTemporalConverter2_0.Adapter.instance() + JavaBaseEnumeratedConverter.MapKeyAdapter.instance(), + JavaBaseTemporalConverter.MapKeyAdapter.instance() }; protected static final Iterable<JavaConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = new ArrayIterable<JavaConverter.Adapter>(MAP_KEY_CONVERTER_ADAPTER_ARRAY); @@ -1335,16 +1333,6 @@ public abstract class AbstractJavaElementCollectionMapping2_0 // ********** misc ********** @Override - public JavaPersistentAttribute2_0 getParent() { - return (JavaPersistentAttribute2_0) super.getParent(); - } - - @Override - public JavaPersistentAttribute2_0 getPersistentAttribute() { - return (JavaPersistentAttribute2_0) super.getPersistentAttribute(); - } - - @Override protected JpaFactory2_0 getJpaFactory() { return (JpaFactory2_0) super.getJpaFactory(); } @@ -1429,7 +1417,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 @Override protected String getMetamodelFieldTypeName() { - return this.getPersistentAttribute().getMetamodelContainerFieldTypeName(); + return ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -1444,7 +1432,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = this.getPersistentAttribute().getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -1846,7 +1834,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 return AbstractJavaElementCollectionMapping2_0.this.getCollectionTable(); } - protected JavaPersistentAttribute2_0 getPersistentAttribute() { + protected JavaPersistentAttribute 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/GenericJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java index aab221ccde..4e9665c993 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCacheable2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.Cacheable2_0Annotation; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.Cacheable2_0Annotation; */ public class GenericJavaCacheable2_0 extends AbstractJavaJpaContextNode - implements JavaCacheable2_0 + implements Cacheable2_0 { protected Boolean specifiedCacheable; protected boolean defaultCacheable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java index 1e1ac8a949..68e844c542 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaDerivedIdentity2_0.java @@ -13,9 +13,9 @@ import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentityStrategy2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.IdDerivedIdentityStrategy2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.MapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaIdDerivedIdentityStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -27,9 +27,9 @@ public class GenericJavaDerivedIdentity2_0 /** this can be <code>null</code> */ protected DerivedIdentityStrategy2_0 strategy; - protected final JavaIdDerivedIdentityStrategy2_0 idStrategy; + protected final IdDerivedIdentityStrategy2_0 idStrategy; - protected final JavaMapsIdDerivedIdentityStrategy2_0 mapsIdStrategy; + protected final MapsIdDerivedIdentityStrategy2_0 mapsIdStrategy; public GenericJavaDerivedIdentity2_0(JavaSingleRelationshipMapping2_0 parent) { @@ -99,7 +99,7 @@ public class GenericJavaDerivedIdentity2_0 // ********** ID strategy ********** - public JavaIdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy() { + public IdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy() { return this.idStrategy; } @@ -113,14 +113,14 @@ public class GenericJavaDerivedIdentity2_0 return this.strategy == this.idStrategy; } - protected JavaIdDerivedIdentityStrategy2_0 buildIdStrategy() { + protected IdDerivedIdentityStrategy2_0 buildIdStrategy() { return new GenericJavaIdDerivedIdentityStrategy2_0(this); } // ********** maps ID strategy ********** - public JavaMapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy() { + public MapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy() { return this.mapsIdStrategy; } @@ -134,7 +134,7 @@ public class GenericJavaDerivedIdentity2_0 return this.strategy == this.mapsIdStrategy; } - protected JavaMapsIdDerivedIdentityStrategy2_0 buildMapsIdStrategy() { + protected MapsIdDerivedIdentityStrategy2_0 buildMapsIdStrategy() { return new GenericJavaMapsIdDerivedIdentityStrategy2_0(this); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java index 679087ba11..8c2456836e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaIdDerivedIdentityStrategy2_0.java @@ -13,8 +13,8 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; +import org.eclipse.jpt.jpa.core.jpa2.context.IdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -22,7 +22,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaIdDerivedIdentityStrategy2_0 extends AbstractJavaJpaContextNode - implements JavaIdDerivedIdentityStrategy2_0 + implements IdDerivedIdentityStrategy2_0 { protected boolean value; 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 5809b946b5..0f626f728b 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 @@ -32,8 +32,8 @@ import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationDescriptionMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; import org.eclipse.osgi.util.NLS; @@ -42,7 +42,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaMapsIdDerivedIdentityStrategy2_0 extends AbstractJavaJpaContextNode - implements JavaMapsIdDerivedIdentityStrategy2_0 + implements MapsIdDerivedIdentityStrategy2_0 { protected String specifiedIdAttributeName; protected String defaultIdAttributeName; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java index bc5fd4d18d..29026c1b6d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrderColumn2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaNamedColumn; import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.OrderColumn2_0AnnotationDefinition; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderColumn2_0; @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation; * Java order column */ public class GenericJavaOrderColumn2_0 - extends AbstractJavaNamedColumn<OrderColumn2_0Annotation, JavaReadOnlyNamedColumn.Owner> + extends AbstractJavaNamedColumn<OrderColumn2_0Annotation, ReadOnlyNamedColumn.Owner> implements JavaOrderColumn2_0 { protected Boolean specifiedNullable; @@ -37,7 +37,7 @@ public class GenericJavaOrderColumn2_0 protected OrderColumn2_0Annotation nullColumnAnnotation; - public GenericJavaOrderColumn2_0(JavaOrderable2_0 parent, JavaReadOnlyNamedColumn.Owner owner) { + public GenericJavaOrderColumn2_0(JavaOrderable2_0 parent, ReadOnlyNamedColumn.Owner owner) { super(parent, owner); //build defaults during construction for performance this.defaultNullable = this.buildDefaultNullable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java index c73f0f454e..37f6debed6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaOrphanRemoval2_0.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.resource.java.OwningRelationshipMapping2_0Annotation; /** @@ -21,13 +21,13 @@ import org.eclipse.jpt.jpa.core.jpa2.resource.java.OwningRelationshipMapping2_0A */ public class GenericJavaOrphanRemoval2_0 extends AbstractJavaJpaContextNode - implements JavaOrphanRemovable2_0 + implements OrphanRemovable2_0 { protected Boolean specifiedOrphanRemoval; protected boolean defaultOrphanRemoval; - public GenericJavaOrphanRemoval2_0(JavaOrphanRemovalHolder2_0 parent) { + public GenericJavaOrphanRemoval2_0(OrphanRemovalHolder2_0 parent) { super(parent); this.specifiedOrphanRemoval = this.buildSpecifiedOrphanRemoval(); } @@ -94,8 +94,8 @@ public class GenericJavaOrphanRemoval2_0 // ********** misc ********** @Override - public JavaOrphanRemovalHolder2_0 getParent() { - return (JavaOrphanRemovalHolder2_0) super.getParent(); + public OrphanRemovalHolder2_0 getParent() { + return (OrphanRemovalHolder2_0) super.getParent(); } protected JavaAttributeMapping getMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java index 65f5e159f3..8df6d1c1f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaPersistentType2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.utility.BodySourceWriter; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaPersistentType; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelSourceType; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentType2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; /** * JPA 2.0 Java persistent type. @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaPersistentType2_0; */ public class GenericJavaPersistentType2_0 extends AbstractJavaPersistentType - implements JavaPersistentType2_0 + implements PersistentType2_0 { protected String declaringTypeName; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java index 8d9b3ee559..219e216df2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0.java @@ -17,23 +17,23 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; 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.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaVirtualOverrideRelationship2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 extends AbstractJavaJpaContextNode - implements JavaVirtualJoinTableRelationshipStrategy, ReadOnlyTable.Owner + implements VirtualJoinTableRelationshipStrategy, ReadOnlyTable.Owner { - protected JavaVirtualJoinTable joinTable; + protected VirtualJoinTable joinTable; - public GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0(JavaVirtualOverrideRelationship2_0 parent) { + public GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0(VirtualOverrideRelationship2_0 parent) { super(parent); } @@ -49,12 +49,12 @@ public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 // ********** join table ********** - public JavaVirtualJoinTable getJoinTable() { + public VirtualJoinTable getJoinTable() { return this.joinTable; } - protected void setJoinTable(JavaVirtualJoinTable joinTable) { - JavaVirtualJoinTable old = this.joinTable; + protected void setJoinTable(VirtualJoinTable joinTable) { + VirtualJoinTable old = this.joinTable; this.joinTable = joinTable; this.firePropertyChanged(JOIN_TABLE_PROPERTY, old, joinTable); } @@ -79,7 +79,7 @@ public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 return (overriddenStrategy == null) ? null : overriddenStrategy.getJoinTable(); } - protected JavaVirtualJoinTable buildJoinTable(ReadOnlyJoinTable overriddenJoinTable) { + protected VirtualJoinTable buildJoinTable(ReadOnlyJoinTable overriddenJoinTable) { return this.getJpaFactory().buildJavaVirtualJoinTable(this, this, overriddenJoinTable); } @@ -87,11 +87,11 @@ public class GenericJavaVirtualOverrideJoinTableRelationshipStrategy2_0 // ********** misc ********** @Override - public JavaVirtualOverrideRelationship2_0 getParent() { - return (JavaVirtualOverrideRelationship2_0) super.getParent(); + public VirtualOverrideRelationship2_0 getParent() { + return (VirtualOverrideRelationship2_0) super.getParent(); } - public JavaVirtualOverrideRelationship2_0 getRelationship() { + public VirtualOverrideRelationship2_0 getRelationship() { return this.getParent(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java index 87d119352f..a7ab453d8b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaCacheable2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; /** @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; */ public class NullJavaCacheable2_0 extends AbstractJavaJpaContextNode - implements JavaCacheable2_0 + implements Cacheable2_0 { public NullJavaCacheable2_0(JavaCacheableHolder2_0 parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java index 10256531ee..8286128f2f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaDerivedIdentity2_0.java @@ -13,9 +13,9 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.java.JavaSingleRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentityStrategy2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.IdDerivedIdentityStrategy2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.MapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaIdDerivedIdentityStrategy2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaMapsIdDerivedIdentityStrategy2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; public class NullJavaDerivedIdentity2_0 @@ -47,7 +47,7 @@ public class NullJavaDerivedIdentity2_0 // ********** ID derived identity strategy ********** - public JavaIdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy() { + public IdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy() { return null; } @@ -62,7 +62,7 @@ public class NullJavaDerivedIdentity2_0 // ********** maps ID derived identity strategy ********** - public JavaMapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy() { + public MapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy() { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java index 9a7a1bdd80..3ce00d43f5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaMultiRelationshipMapping; +import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.jpa.db.Table; @@ -25,7 +25,7 @@ public class NullJavaMapKeyColumn2_0 extends AbstractJavaJpaContextNode implements JavaColumn { - public NullJavaMapKeyColumn2_0(JavaMultiRelationshipMapping parent) { + public NullJavaMapKeyColumn2_0(JavaRelationshipMapping parent) { super(parent); } @@ -225,8 +225,8 @@ public class NullJavaMapKeyColumn2_0 // ********** misc ********** @Override - public JavaMultiRelationshipMapping getParent() { - return (JavaMultiRelationshipMapping) super.getParent(); + public JavaRelationshipMapping getParent() { + return (JavaRelationshipMapping) super.getParent(); } public void initializeFrom(ReadOnlyColumn oldColumn) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java index 89ae8ab11a..5d925f982f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaOrphanRemoval2_0.java @@ -11,17 +11,17 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaJpaContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; /** * Null Java orphan removal */ public class NullJavaOrphanRemoval2_0 extends AbstractJavaJpaContextNode - implements JavaOrphanRemovable2_0 + implements OrphanRemovable2_0 { - public NullJavaOrphanRemoval2_0(JavaOrphanRemovalHolder2_0 parent) { + public NullJavaOrphanRemoval2_0(OrphanRemovalHolder2_0 parent) { super(parent); } @@ -48,8 +48,8 @@ public class NullJavaOrphanRemoval2_0 // ********** misc ********** @Override - public JavaOrphanRemovalHolder2_0 getParent() { - return (JavaOrphanRemovalHolder2_0) super.getParent(); + public OrphanRemovalHolder2_0 getParent() { + return (OrphanRemovalHolder2_0) super.getParent(); } // ********** validation ********** 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 e16b2a36dd..2b7edbee5d 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 @@ -42,6 +42,7 @@ import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; import org.eclipse.jpt.jpa.core.context.JoinColumn; +import org.eclipse.jpt.jpa.core.context.Orderable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -60,15 +61,13 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; 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.OrmBaseEnumeratedConverter; +import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmLobConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyJoinColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmTemporalConverter; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; @@ -96,13 +95,11 @@ 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.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionTable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMapKeyEnumeratedConverter2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmMapKeyTemporalConverter2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmPersistentAttribute2_0; import org.eclipse.jpt.jpa.core.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.MapKey; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; @@ -164,15 +161,15 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen protected static final OrmConverter.Adapter[] CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmEnumeratedConverter.Adapter.instance(), - OrmTemporalConverter.ElementCollectionAdapter.instance(), + OrmBaseEnumeratedConverter.BasicAdapter.instance(), + OrmBaseTemporalConverter.ElementCollectionAdapter.instance(), OrmLobConverter.Adapter.instance() }; protected static final Iterable<OrmConverter.Adapter> CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(CONVERTER_ADAPTER_ARRAY); protected static final OrmConverter.Adapter[] MAP_KEY_CONVERTER_ADAPTER_ARRAY = new OrmConverter.Adapter[] { - OrmMapKeyEnumeratedConverter2_0.Adapter.instance(), - OrmMapKeyTemporalConverter2_0.Adapter.instance() + OrmBaseEnumeratedConverter.MapKeyAdapter.instance(), + OrmBaseTemporalConverter.MapKeyAdapter.instance() }; protected static final Iterable<OrmConverter.Adapter> MAP_KEY_CONVERTER_ADAPTERS = new ArrayIterable<OrmConverter.Adapter>(MAP_KEY_CONVERTER_ADAPTER_ARRAY); @@ -383,7 +380,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen // ********** orderable ********** - public OrmOrderable getOrderable() { + public Orderable getOrderable() { return this.orderable; } @@ -1170,16 +1167,6 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen // ********** misc ********** - @Override - public OrmPersistentAttribute2_0 getParent() { - return (OrmPersistentAttribute2_0) super.getParent(); - } - - @Override - public OrmPersistentAttribute2_0 getPersistentAttribute() { - return (OrmPersistentAttribute2_0) super.getPersistentAttribute(); - } - public String getKey() { return MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY; } @@ -1210,7 +1197,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen @Override protected String getMetamodelFieldTypeName() { - return this.getPersistentAttribute().getMetamodelContainerFieldTypeName(); + return ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldTypeName(); } @Override @@ -1225,7 +1212,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void addMetamodelFieldMapKeyTypeArgumentNameTo(ArrayList<String> typeArgumentNames) { - String keyTypeName = this.getPersistentAttribute().getMetamodelContainerFieldMapKeyTypeName(); + String keyTypeName = ((PersistentAttribute2_0) this.getPersistentAttribute()).getMetamodelContainerFieldMapKeyTypeName(); if (keyTypeName != null) { typeArgumentNames.add(keyTypeName); } @@ -1847,7 +1834,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen return AbstractOrmElementCollectionMapping2_0.this.getCollectionTable(); } - protected OrmPersistentAttribute2_0 getPersistentAttribute() { + protected PersistentAttribute 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/GenericOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java index 976ba93809..8af460bad5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0; @@ -20,7 +20,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlCacheable_2_0; */ public class GenericOrmCacheable2_0 extends AbstractOrmXmlContextNode - implements OrmCacheable2_0 + implements Cacheable2_0 { protected Boolean specifiedCacheable; protected boolean defaultCacheable; 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 48922a3903..d97f97fd92 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,8 @@ ******************************************************************************/ 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.PersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmNamedColumn; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0; @@ -184,7 +184,7 @@ public class GenericOrmOrderColumn2_0 return this.getParent(); } - protected OrmAttributeMapping getAttributeMapping() { + protected AttributeMapping getAttributeMapping() { return this.getOrderable().getParent(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java index e338f9655e..15e0152afb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOrphanRemovable_2_0; @@ -22,13 +22,13 @@ import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlOrphanRemovable_2_0; */ public class GenericOrmOrphanRemoval2_0 extends AbstractOrmXmlContextNode - implements OrmOrphanRemovable2_0 + implements OrphanRemovable2_0 { protected Boolean specifiedOrphanRemoval; protected boolean defaultOrphanRemoval; - public GenericOrmOrphanRemoval2_0(OrmOrphanRemovalHolder2_0 parent) { + public GenericOrmOrphanRemoval2_0(OrphanRemovalHolder2_0 parent) { super(parent); this.specifiedOrphanRemoval = this.buildSpecifiedOrphanRemoval(); } @@ -92,8 +92,8 @@ public class GenericOrmOrphanRemoval2_0 // ********** misc ********** @Override - public OrmOrphanRemovalHolder2_0 getParent() { - return (OrmOrphanRemovalHolder2_0) super.getParent(); + public OrphanRemovalHolder2_0 getParent() { + return (OrphanRemovalHolder2_0) super.getParent(); } protected OrmAttributeMapping getMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java index 0b4c77e23e..7278b34cfb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0.java @@ -17,23 +17,23 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTable; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTable; +import org.eclipse.jpt.jpa.core.context.VirtualJoinTableRelationshipStrategy; 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.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmVirtualOverrideRelationship2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0 extends AbstractOrmXmlContextNode - implements OrmVirtualJoinTableRelationshipStrategy, ReadOnlyTable.Owner + implements VirtualJoinTableRelationshipStrategy, ReadOnlyTable.Owner { - protected OrmVirtualJoinTable joinTable; + protected VirtualJoinTable joinTable; - public GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0(OrmVirtualOverrideRelationship2_0 parent) { + public GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0(VirtualOverrideRelationship2_0 parent) { super(parent); } @@ -49,12 +49,12 @@ public class GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0 // ********** join table ********** - public OrmVirtualJoinTable getJoinTable() { + public VirtualJoinTable getJoinTable() { return this.joinTable; } - protected void setJoinTable(OrmVirtualJoinTable joinTable) { - OrmVirtualJoinTable old = this.joinTable; + protected void setJoinTable(VirtualJoinTable joinTable) { + VirtualJoinTable old = this.joinTable; this.joinTable = joinTable; this.firePropertyChanged(JOIN_TABLE_PROPERTY, old, joinTable); } @@ -79,7 +79,7 @@ public class GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0 return (overriddenStrategy == null) ? null : overriddenStrategy.getJoinTable(); } - protected OrmVirtualJoinTable buildJoinTable(ReadOnlyJoinTable overriddenJoinTable) { + protected VirtualJoinTable buildJoinTable(ReadOnlyJoinTable overriddenJoinTable) { return this.getContextNodeFactory().buildOrmVirtualJoinTable(this, this, overriddenJoinTable); } @@ -87,11 +87,11 @@ public class GenericOrmVirtualOverrideJoinTableRelationshipStrategy2_0 // ********** misc ********** @Override - public OrmVirtualOverrideRelationship2_0 getParent() { - return (OrmVirtualOverrideRelationship2_0) super.getParent(); + public VirtualOverrideRelationship2_0 getParent() { + return (VirtualOverrideRelationship2_0) super.getParent(); } - public OrmVirtualOverrideRelationship2_0 getRelationship() { + public VirtualOverrideRelationship2_0 getRelationship() { return this.getParent(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java index 69f10e616e..7e4b16b247 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java @@ -10,21 +10,23 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +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.OrmEmbeddable; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedQuery; -import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; 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.AbstractOrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmOrderable; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmAssociationOverrideContainer2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCollectionTable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmDerivedIdentity2_0; @@ -32,8 +34,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmEmbeddedMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmSingleRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection; @@ -46,7 +46,7 @@ public class GenericOrmXml2_0ContextNodeFactory implements OrmXml2_0ContextNodeFactory { @Override - public OrmOrderable buildOrmOrderable(OrmAttributeMapping parent) { + public Orderable buildOrmOrderable(OrmAttributeMapping parent) { throw new UnsupportedOperationException("use #buildOrmOrderable(OrmAttributeMapping parent, Orderable2_0.Owner owner)"); //$NON-NLS-1$ } @@ -74,11 +74,11 @@ public class GenericOrmXml2_0ContextNodeFactory return new GenericOrmElementCollectionMapping2_0(parent, resourceMapping); } - public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent) { + public Cacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent) { return new GenericOrmCacheable2_0(parent); } - public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent) { + public OrphanRemovable2_0 buildOrmOrphanRemoval(OrphanRemovalHolder2_0 parent) { return new GenericOrmOrphanRemoval2_0(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java index 1a8eef92ed..4182432c1b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmCacheable2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0; /** @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0; */ public class NullOrmCacheable2_0 extends AbstractOrmXmlContextNode - implements OrmCacheable2_0 + implements Cacheable2_0 { public NullOrmCacheable2_0(OrmCacheableHolder2_0 parent) { super(parent); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java index 104cef2cc6..3d74b7bb87 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/NullOrmOrphanRemoval2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,17 +11,17 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; /** * Null <code>orm.xml</code> orphan removal */ public class NullOrmOrphanRemoval2_0 extends AbstractOrmXmlContextNode - implements OrmOrphanRemovable2_0 + implements OrphanRemovable2_0 { - public NullOrmOrphanRemoval2_0(OrmOrphanRemovalHolder2_0 parent) { + public NullOrmOrphanRemoval2_0(OrphanRemovalHolder2_0 parent) { super(parent); } @@ -48,8 +48,8 @@ public class NullOrmOrphanRemoval2_0 // ********** misc ********** @Override - public OrmOrphanRemovalHolder2_0 getParent() { - return (OrmOrphanRemovalHolder2_0) super.getParent(); + public OrphanRemovalHolder2_0 getParent() { + return (OrphanRemovalHolder2_0) super.getParent(); } public TextRange getValidationTextRange() { 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 6cb42c9371..ed18e787e1 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 @@ -12,17 +12,19 @@ package org.eclipse.jpt.jpa.core.jpa2; import org.eclipse.jpt.jpa.core.JpaDataSource; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.Orderable; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; 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.JavaColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaOrderable; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaReadOnlyNamedColumn; +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; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0.Owner; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionTable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaDerivedIdentity2_0; @@ -30,8 +32,6 @@ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_ import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEmbeddedMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrderable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaSingleRelationshipMapping2_0; import org.eclipse.jpt.jpa.db.DatabaseIdentifierAdapter; @@ -74,11 +74,11 @@ public interface JpaFactory2_0 JavaElementCollectionMapping2_0 buildJavaElementCollectionMapping2_0(JavaPersistentAttribute parent); - JavaCacheable2_0 buildJavaCacheable(JavaCacheableHolder2_0 parent); + Cacheable2_0 buildJavaCacheable(JavaCacheableHolder2_0 parent); - JavaOrphanRemovable2_0 buildJavaOrphanRemoval(JavaOrphanRemovalHolder2_0 parent); + OrphanRemovable2_0 buildJavaOrphanRemoval(OrphanRemovalHolder2_0 parent); - JavaOrderColumn2_0 buildJavaOrderColumn(JavaOrderable2_0 parent, JavaReadOnlyNamedColumn.Owner owner); + JavaOrderColumn2_0 buildJavaOrderColumn(JavaOrderable2_0 parent, ReadOnlyNamedColumn.Owner owner); JavaCollectionTable2_0 buildJavaCollectionTable(JavaElementCollectionMapping2_0 parent, Table.Owner owner); @@ -89,5 +89,5 @@ public interface JpaFactory2_0 /** * Use {@link #buildJavaOrderable(JavaAttributeMapping, Owner)}. */ - JavaOrderable buildJavaOrderable(JavaAttributeMapping parent); + Orderable buildJavaOrderable(JavaAttributeMapping parent); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheable2_0.java deleted file mode 100644 index 2cb45fc311..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheable2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; - -/** - * Java cacheable - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaCacheable2_0 - extends Cacheable2_0 -{ - // combine two interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheableHolder2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheableHolder2_0.java index ac6a4bb3f2..35a28fc6c3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheableHolder2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCacheableHolder2_0.java @@ -28,5 +28,4 @@ public interface JavaCacheableHolder2_0 extends CacheableHolder2_0 { JavaResourceType getJavaResourceType(); - JavaCacheable2_0 getCacheable(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCascade2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCascade2_0.java deleted file mode 100644 index 058d01a308..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCascade2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaCascade; -import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; - -/** - * Java cascade (persist, merge, remove, refresh, detach) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaCascade2_0 - extends JavaCascade, Cascade2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java index 2f176f777c..79ad5fadef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.jpa2.context.java; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.java.JavaCollectionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; @@ -24,11 +23,11 @@ import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.3 */ public interface JavaCollectionMapping2_0 - extends CollectionMapping2_0, JavaCollectionMapping, JavaConvertibleKeyMapping2_0 + extends CollectionMapping2_0, JavaConvertibleKeyMapping2_0 { JavaAttributeOverrideContainer getMapKeyAttributeOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java index 7464e90c85..96792657c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaDerivedIdentity2_0.java @@ -27,8 +27,4 @@ public interface JavaDerivedIdentity2_0 extends DerivedIdentity2_0 { JavaSingleRelationshipMapping2_0 getMapping(); - - JavaIdDerivedIdentityStrategy2_0 getIdDerivedIdentityStrategy(); - - JavaMapsIdDerivedIdentityStrategy2_0 getMapsIdDerivedIdentityStrategy(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaIdDerivedIdentityStrategy2_0.java deleted file mode 100644 index 21bb9d05e3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaIdDerivedIdentityStrategy2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.jpa2.context.IdDerivedIdentityStrategy2_0; - -/** - * Java ID derived identity strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaIdDerivedIdentityStrategy2_0 - extends IdDerivedIdentityStrategy2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToManyMapping2_0.java deleted file mode 100644 index b0b9ca3f51..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToManyMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; - -/** - * JPA 2.0 Java m:m mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaManyToManyMapping2_0 - extends ManyToManyMapping2_0, JavaManyToManyMapping, JavaCollectionMapping2_0 -{ - // combine various mappings -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToOneMapping2_0.java deleted file mode 100644 index d605e66a1f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaManyToOneMapping2_0.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.ManyToOne2_0Annotation; - -/** - * JPA 2.0 Java m:1 mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaManyToOneMapping2_0 - extends ManyToOneMapping2_0, JavaManyToOneMapping, JavaSingleRelationshipMapping2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyEnumeratedConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyEnumeratedConverter2_0.java deleted file mode 100644 index faa6243643..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyEnumeratedConverter2_0.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.jpa.core.JpaFactory; -import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaBaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumerated2_0Annotation; - -/** - * Java map key enumerated converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMapKeyEnumeratedConverter2_0 - extends JavaBaseEnumeratedConverter -{ - // ********** adapter ********** - - public static class Adapter - extends JavaConverter.AbstractAdapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseEnumeratedConverter.class; - } - - @Override - protected String getAnnotationName() { - return MapKeyEnumerated2_0Annotation.ANNOTATION_NAME; - } - - public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { - return factory.buildJavaBaseEnumeratedConverter(parent, (MapKeyEnumerated2_0Annotation) converterAnnotation, this.buildOwner()); - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java deleted file mode 100644 index 14cb26ee5f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapKeyTemporalConverter2_0.java +++ /dev/null @@ -1,71 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.jpa.core.JpaFactory; -import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaBaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.java.JavaConverter; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.JavaMapKeyTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation; - -/** - * Java map key temporal converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMapKeyTemporalConverter2_0 - extends JavaBaseTemporalConverter -{ - // ********** adapter ********** - - public static class Adapter - extends JavaConverter.AbstractAdapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseTemporalConverter.class; - } - - @Override - protected String getAnnotationName() { - return MapKeyTemporal2_0Annotation.ANNOTATION_NAME; - } - - public JavaConverter buildConverter(Annotation converterAnnotation, JavaAttributeMapping parent, JpaFactory factory) { - return factory.buildJavaBaseTemporalConverter((JavaCollectionMapping2_0) parent, (MapKeyTemporal2_0Annotation) converterAnnotation, this.buildOwner()); - } - - @Override - protected Owner buildOwner() { - return new Owner() { - public JptValidator buildValidator(Converter converter) { - return new JavaMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinColumnRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinColumnRelationshipStrategy2_0.java deleted file mode 100644 index b65c8d46dd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinColumnRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumnRelationshipStrategy; - -/** - * Java mapping join column relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMappingJoinColumnRelationshipStrategy2_0 - extends JavaMappingRelationshipStrategy2_0, JavaJoinColumnRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinTableRelationshipStrategy2_0.java deleted file mode 100644 index 5d8c7c7d28..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingJoinTableRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaJoinTableRelationshipStrategy; - -/** - * Java mapping join table relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMappingJoinTableRelationshipStrategy2_0 - extends JavaMappingRelationshipStrategy2_0, JavaJoinTableRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingMappedByRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingMappedByRelationshipStrategy2_0.java deleted file mode 100644 index 48afe663f4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingMappedByRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaMappedByRelationshipStrategy; - -/** - * Java mapping "mapped by" relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMappingMappedByRelationshipStrategy2_0 - extends JavaMappingRelationshipStrategy2_0, JavaMappedByRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java deleted file mode 100644 index 78f96e9e62..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumnRelationshipStrategy; - -/** - * Java mapping primary key join column relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 - extends JavaMappingRelationshipStrategy2_0, JavaPrimaryKeyJoinColumnRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingRelationshipStrategy2_0.java deleted file mode 100644 index b9963e3400..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMappingRelationshipStrategy2_0.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; - -/** - * Java mapping relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaMappingRelationshipStrategy2_0 - extends MappingRelationshipStrategy2_0, JavaRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapsIdDerivedIdentityStrategy2_0.java deleted file mode 100644 index 90a43f7340..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaMapsIdDerivedIdentityStrategy2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.jpa2.context.MapsIdDerivedIdentityStrategy2_0; - -/** - * Java maps ID derived identity strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaMapsIdDerivedIdentityStrategy2_0 - extends MapsIdDerivedIdentityStrategy2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToManyMapping2_0.java deleted file mode 100644 index 39e2316cd3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToManyMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; - -/** - * JPA 2.0 Java 1:m mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaOneToManyMapping2_0 - extends OneToManyMapping2_0, JavaOneToManyMapping, JavaCollectionMapping2_0 -{ - // combine various interfaces -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToOneMapping2_0.java deleted file mode 100644 index 20746176bf..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOneToOneMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; - -/** - * JPA 2.0 Java 1:1 mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaOneToOneMapping2_0 - extends OneToOneMapping2_0, JavaOneToOneMapping, JavaSingleRelationshipMapping2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrderable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrderable2_0.java index 04a1643b2b..2ab8faf9c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrderable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrderable2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.core.jpa2.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaOrderable; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; /** @@ -22,11 +21,11 @@ import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface JavaOrderable2_0 - extends Orderable2_0, JavaOrderable + extends Orderable2_0 { JavaResourceAttribute getResourceAttribute(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovable2_0.java deleted file mode 100644 index 7782802b7b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovable2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; - -/** - * Java orphan removal - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaOrphanRemovable2_0 - extends OrphanRemovable2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovalHolder2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovalHolder2_0.java deleted file mode 100644 index f31271877e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaOrphanRemovalHolder2_0.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2009, 2012 Oracle. All rights reserved. -* This program and the accompanying materials are made available under the -* terms of the Eclipse Public License v1.0, which accompanies this distribution -* and is available at http://www.eclipse.org/legal/epl-v10.html. -* -* Contributors: -* Oracle - initial API and implementation -*******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; - -/** - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface JavaOrphanRemovalHolder2_0 - extends OrphanRemovalHolder2_0 -{ - JavaOrphanRemovable2_0 getOrphanRemoval(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentAttribute2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentAttribute2_0.java deleted file mode 100644 index 41cdcc8b38..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentAttribute2_0.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; - -/** - * JPA 2.0 - * Context Java 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 - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaPersistentAttribute2_0 - extends JavaPersistentAttribute, PersistentAttribute2_0 -{ - // combine two interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentType2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentType2_0.java deleted file mode 100644 index 0c87cab4bb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaPersistentType2_0.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; - -/** - * JPA 2.0 context Java persistent type. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface JavaPersistentType2_0 - extends JavaPersistentType, PersistentType2_0 -{ - ListIterable<JavaPersistentAttribute> getAttributes(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualAssociationOverride2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualAssociationOverride2_0.java deleted file mode 100644 index 4941d63159..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualAssociationOverride2_0.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; - -/** - * JPA 2.0 - * Java <em>virtual</em> association override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualAssociationOverride2_0 - extends JavaVirtualAssociationOverride, ReadOnlyAssociationOverride2_0 -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualOverrideRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualOverrideRelationship2_0.java deleted file mode 100644 index 06e744eeb6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaVirtualOverrideRelationship2_0.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.java; - -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationship; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.java.JavaVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; - -/** - * JPA 2.0 Java virtual association override relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface JavaVirtualOverrideRelationship2_0 - extends VirtualOverrideRelationship2_0, - JavaVirtualOverrideRelationship, - JavaVirtualJoinTableRelationship -{ - JavaVirtualJoinTableRelationshipStrategy getJoinTableStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheable2_0.java deleted file mode 100644 index 0bcc9bdb4f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheable2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; - -/** - * <code>orm.xml</code> cacheable - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface OrmCacheable2_0 - extends Cacheable2_0 -{ - // combine two interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheableHolder2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheableHolder2_0.java index 684f76c12d..7b4218d41c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheableHolder2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCacheableHolder2_0.java @@ -28,5 +28,4 @@ public interface OrmCacheableHolder2_0 extends CacheableHolder2_0 { XmlCacheable_2_0 getXmlCacheable(); - OrmCacheable2_0 getCacheable(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCascade2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCascade2_0.java deleted file mode 100644 index bfa95fc752..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCascade2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmCascade; -import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; - -/** - * <code>orm.xml</code> cascade (persist, merge, remove, refresh, detach) - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmCascade2_0 - extends OrmCascade, Cascade2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java index c2f4c06c21..6849f9b727 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.core.jpa2.context.orm; import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmCollectionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; @@ -24,11 +23,11 @@ import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 3.1 + * @version 3.3 * @since 2.3 */ public interface OrmCollectionMapping2_0 - extends CollectionMapping2_0, OrmCollectionMapping, OrmConvertibleKeyMapping2_0 + extends CollectionMapping2_0, OrmConvertibleKeyMapping2_0 { OrmAttributeOverrideContainer getMapKeyAttributeOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToManyMapping2_0.java deleted file mode 100644 index 68305194a6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToManyMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; - -/** - * JPA 2.0 <code>orm.xml</code> m:m mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmManyToManyMapping2_0 - extends ManyToManyMapping2_0, OrmManyToManyMapping, OrmCollectionMapping2_0 -{ - // combine various mappings -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToOneMapping2_0.java deleted file mode 100644 index 9e5da40de2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmManyToOneMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; - -/** - * JPA 2.0 <code>orm.xml</code> m:1 mapping. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmManyToOneMapping2_0 - extends ManyToOneMapping2_0, OrmManyToOneMapping, OrmSingleRelationshipMapping2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java deleted file mode 100644 index 3e24e49527..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyEnumeratedConverter2_0.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmBaseEnumeratedConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.resource.orm.EnumType; -import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0; - -/** - * <code>orm.xml</code> map key enumerated converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMapKeyEnumeratedConverter2_0 - extends OrmBaseEnumeratedConverter -{ - // ********** adapter ********** - - public static class Adapter - implements OrmConverter.Adapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseEnumeratedConverter.class; - } - - public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - XmlMapKeyConvertibleMapping_2_0 xmlMapping = (XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping(); - return (xmlMapping.getMapKeyEnumerated() == null) ? null : factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner(xmlMapping)); - } - - protected OrmBaseEnumeratedConverter.Owner buildOwner(final XmlMapKeyConvertibleMapping_2_0 mapping) { - return new OrmBaseEnumeratedConverter.Owner() { - public void setXmlEnumType(EnumType enumType) { - mapping.setMapKeyEnumerated(enumType); - } - - public EnumType getXmlEnumType() { - return mapping.getMapKeyEnumerated(); - } - - public TextRange getEnumTextRange() { - return mapping.getMapKeyEnumeratedTextRange(); - } - - public JptValidator buildValidator(Converter converter) { - return JptValidator.Null.instance(); - } - }; - } - - public boolean isActive(XmlAttributeMapping xmlMapping) { - return ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).getMapKeyEnumerated() != null; - } - - public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - return factory.buildOrmBaseEnumeratedConverter(parent, this.buildOwner((XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping())); - } - - public void clearXmlValue(XmlAttributeMapping xmlMapping) { - ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).setMapKeyEnumerated(null); - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java deleted file mode 100644 index b5daa9c67f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMapKeyTemporalConverter2_0.java +++ /dev/null @@ -1,92 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmBaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmConverter; -import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; -import org.eclipse.jpt.jpa.core.internal.context.JptValidator; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.OrmMapKeyTemporalConverterValidator; -import org.eclipse.jpt.jpa.core.resource.orm.TemporalType; -import org.eclipse.jpt.jpa.core.resource.orm.XmlAttributeMapping; -import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlMapKeyConvertibleMapping_2_0; - -/** - * <code>orm.xml</code> map key temporal converter - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMapKeyTemporalConverter2_0 - extends OrmBaseTemporalConverter -{ - // ********** adapter ********** - - public static class Adapter - implements OrmConverter.Adapter - { - private static final Adapter INSTANCE = new Adapter(); - public static Adapter instance() { - return INSTANCE; - } - - private Adapter() { - super(); - } - - public Class<? extends Converter> getConverterType() { - return BaseTemporalConverter.class; - } - - public OrmConverter buildConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - XmlMapKeyConvertibleMapping_2_0 xmlMapping = (XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping(); - return (xmlMapping.getMapKeyTemporal() == null) ? null : factory.buildOrmBaseTemporalConverter(parent, this.buildOwner(xmlMapping)); - } - - protected OrmBaseTemporalConverter.Owner buildOwner(final XmlMapKeyConvertibleMapping_2_0 mapping) { - return new OrmBaseTemporalConverter.Owner() { - public void setXmlTemporalType(TemporalType temporalType) { - mapping.setMapKeyTemporal(temporalType); - } - - public TemporalType getXmlTemporalType() { - return mapping.getMapKeyTemporal(); - } - - public TextRange getTemporalTextRange() { - return mapping.getMapKeyTemporalTextRange(); - } - - public JptValidator buildValidator(Converter converter) { - return new OrmMapKeyTemporalConverterValidator((BaseTemporalConverter) converter); - } - }; - } - - public boolean isActive(XmlAttributeMapping xmlMapping) { - return ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).getMapKeyTemporal() != null; - } - - public OrmConverter buildNewConverter(OrmAttributeMapping parent, OrmXmlContextNodeFactory factory) { - return factory.buildOrmBaseTemporalConverter(parent, this.buildOwner((XmlMapKeyConvertibleMapping_2_0) parent.getXmlAttributeMapping())); - } - - public void clearXmlValue(XmlAttributeMapping xmlMapping) { - ((XmlMapKeyConvertibleMapping_2_0) xmlMapping).setMapKeyTemporal(null); - } - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinColumnRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinColumnRelationshipStrategy2_0.java deleted file mode 100644 index b65a3e0bef..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinColumnRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumnRelationshipStrategy; - -/** - * <code>orm.xml</code> mapping join column relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMappingJoinColumnRelationshipStrategy2_0 - extends OrmMappingRelationshipStrategy2_0, OrmJoinColumnRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinTableRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinTableRelationshipStrategy2_0.java deleted file mode 100644 index 94ae8fae9c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingJoinTableRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmJoinTableRelationshipStrategy; - -/** - * <code>orm.xml</code> mapping join table relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMappingJoinTableRelationshipStrategy2_0 - extends OrmMappingRelationshipStrategy2_0, OrmJoinTableRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingMappedByRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingMappedByRelationshipStrategy2_0.java deleted file mode 100644 index 02d3e5ac1b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingMappedByRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedByRelationshipStrategy; - -/** - * <code>orm.xml</code> mapping "mapped by" relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMappingMappedByRelationshipStrategy2_0 - extends OrmMappingRelationshipStrategy2_0, OrmMappedByRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java deleted file mode 100644 index 41f61c1970..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmPrimaryKeyJoinColumnRelationshipStrategy; - -/** - * <code>orm.xml</code> mapping primary key join column relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMappingPrimaryKeyJoinColumnRelationshipStrategy2_0 - extends OrmMappingRelationshipStrategy2_0, OrmPrimaryKeyJoinColumnRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingRelationshipStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingRelationshipStrategy2_0.java deleted file mode 100644 index e6f0486254..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmMappingRelationshipStrategy2_0.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipStrategy; -import org.eclipse.jpt.jpa.core.jpa2.context.MappingRelationshipStrategy2_0; - -/** - * <code>orm.xml</code> mapping relationship strategy - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmMappingRelationshipStrategy2_0 - extends MappingRelationshipStrategy2_0, OrmRelationshipStrategy -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToManyMapping2_0.java deleted file mode 100644 index 47c81ee816..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToManyMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; - -/** - * JPA 2.0 <code>orm.xml</code> 1:m mapping - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmOneToManyMapping2_0 - extends OneToManyMapping2_0, OrmOneToManyMapping, OrmCollectionMapping2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToOneMapping2_0.java deleted file mode 100644 index a78fa8a746..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOneToOneMapping2_0.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; - -/** - * JPA 2.0 <code>orm.xml</code> 1:1 mapping. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmOneToOneMapping2_0 - extends OneToOneMapping2_0, OrmOneToOneMapping, OrmSingleRelationshipMapping2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderColumn2_0.java index 234210e4a1..fdcadcf2cf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderColumn2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.orm; +import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn; @@ -23,7 +23,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOrderColumn; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmOrderColumn2_0 @@ -38,7 +38,7 @@ public interface OrmOrderColumn2_0 * interface allowing order columns to be used in multiple places */ interface Owner - extends OrmReadOnlyNamedColumn.Owner + extends ReadOnlyNamedColumn.Owner { XmlOrderColumn getXmlColumn(); XmlOrderColumn buildXmlColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderable2_0.java index 48bd529572..855fe1cf6c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrderable2_0.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2010 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.orm; -import org.eclipse.jpt.jpa.core.context.orm.OrmOrderable; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; /** @@ -21,11 +20,11 @@ import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmOrderable2_0 - extends Orderable2_0, OrmOrderable + extends Orderable2_0 { OrmOrderColumn2_0 getOrderColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovable2_0.java deleted file mode 100644 index f936481095..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovable2_0.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; - -/** - * <code>orm.xml</code> orphan removal - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface OrmOrphanRemovable2_0 - extends OrphanRemovable2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovalHolder2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovalHolder2_0.java deleted file mode 100644 index ce443ef4d7..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmOrphanRemovalHolder2_0.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* -* Copyright (c) 2009, 2012 Oracle. All rights reserved. -* This program and the accompanying materials are made available under the -* terms of the Eclipse Public License v1.0, which accompanies this distribution -* and is available at http://www.eclipse.org/legal/epl-v10.html. -* -* Contributors: -* Oracle - initial API and implementation -*******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; - -/** - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 3.3 - * @since 2.3 - */ -public interface OrmOrphanRemovalHolder2_0 - extends OrphanRemovalHolder2_0 -{ - OrmOrphanRemovable2_0 getOrphanRemoval(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentAttribute2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentAttribute2_0.java deleted file mode 100644 index 6610cd06a7..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentAttribute2_0.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; - -/** - * JPA 2.0 - * Context <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 - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmPersistentAttribute2_0 - extends OrmPersistentAttribute, PersistentAttribute2_0 -{ - // combine two interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentType2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentType2_0.java deleted file mode 100644 index 76e63a2096..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmPersistentType2_0.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.PersistentType2_0; - -/** - * JPA 2.0 context <code>orm.xml</code> persistent type. - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmPersistentType2_0 - extends OrmPersistentType, PersistentType2_0 -{ - ListIterable<OrmReadOnlyPersistentAttribute> getAttributes(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmReadOnlyPersistentAttribute2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmReadOnlyPersistentAttribute2_0.java deleted file mode 100644 index fff1c9a9b5..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmReadOnlyPersistentAttribute2_0.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyPersistentAttribute2_0; - -/** - * JPA 2.0 - * Read-only context <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 - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - * - * @version 2.3 - * @since 2.3 - */ -public interface OrmReadOnlyPersistentAttribute2_0 - extends OrmReadOnlyPersistentAttribute, ReadOnlyPersistentAttribute2_0 -{ - // combine various interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualAssociationOverride2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualAssociationOverride2_0.java deleted file mode 100644 index 53ae5e6f27..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualAssociationOverride2_0.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualAssociationOverride; -import org.eclipse.jpt.jpa.core.jpa2.context.ReadOnlyAssociationOverride2_0; - -/** - * JPA 2.0 - * <code>orm.xml</code> <em>virtual</em> association override - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualAssociationOverride2_0 - extends OrmVirtualAssociationOverride, ReadOnlyAssociationOverride2_0 -{ - // combine interfaces -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualOverrideRelationship2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualOverrideRelationship2_0.java deleted file mode 100644 index cbc36fb12c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmVirtualOverrideRelationship2_0.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0, which accompanies this distribution - * and is available at http://www.eclipse.org/legal/epl-v10.html. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.jpa2.context.orm; - -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationship; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualJoinTableRelationshipStrategy; -import org.eclipse.jpt.jpa.core.context.orm.OrmVirtualOverrideRelationship; -import org.eclipse.jpt.jpa.core.jpa2.context.VirtualOverrideRelationship2_0; - -/** - * JPA 2.0 <code>orm.xml</code> virtual association override relationship - * <p> - * Provisional API: This interface is part of an interim API that is still - * under development and expected to change significantly before reaching - * stability. It is available at this early stage to solicit feedback from - * pioneering adopters on the understanding that any code that uses this API - * will almost certainly be broken (repeatedly) as the API evolves. - */ -public interface OrmVirtualOverrideRelationship2_0 - extends VirtualOverrideRelationship2_0, - OrmVirtualOverrideRelationship, - OrmVirtualJoinTableRelationship -{ - OrmVirtualJoinTableRelationshipStrategy getJoinTableStrategy(); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java index 6c9da52217..fbcb8d20d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2011 Oracle. All rights reserved. + * Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -14,7 +14,10 @@ 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.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; +import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection; /** @@ -26,7 +29,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlElementCollection; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. * - * @version 2.3 + * @version 3.3 * @since 2.3 */ public interface OrmXml2_0ContextNodeFactory @@ -38,9 +41,9 @@ public interface OrmXml2_0ContextNodeFactory OrmElementCollectionMapping2_0 buildOrmElementCollectionMapping2_0(OrmPersistentAttribute parent, XmlElementCollection resourceMapping); - OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent); + Cacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent); - OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent); + OrphanRemovable2_0 buildOrmOrphanRemoval(OrphanRemovalHolder2_0 parent); OrmOrderable2_0 buildOrmOrderable(OrmAttributeMapping parent, Orderable2_0.Owner owner); |