diff options
333 files changed, 4699 insertions, 6498 deletions
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 85cc9dbd0f..95fccb1145 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 @@ -66,7 +66,6 @@ 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.JavaDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.jpa.core.context.java.JavaIdClassReference; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -96,7 +95,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.java.JavaAssociationOverrideContainer2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAttributeOverrideContainer2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCacheableHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEntity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOverrideContainer2_0; import org.eclipse.jpt.jpa.core.resource.java.DiscriminatorValueAnnotation; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; @@ -112,7 +111,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaEntity extends AbstractJavaTypeMapping<EntityAnnotation> - implements JavaEntity, JavaCacheableHolder2_0, JavaGeneratorContainer.ParentAdapter, JavaQueryContainer.Owner + implements JavaEntity2_0, JavaGeneratorContainer.ParentAdapter, JavaQueryContainer.Owner { protected String specifiedName; protected String defaultName; 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 f87629ca36..cec826a74e 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 @@ -34,7 +34,6 @@ 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; @@ -66,6 +65,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.NullJavaMapKeyColumn2 import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.NullMapKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MultiRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaAttributeOverrideContainer2_0; @@ -84,7 +84,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaMultiRelationshipMapping<A extends RelationshipMappingAnnotation> extends AbstractJavaRelationshipMapping<A> - implements MultiRelationshipMapping, JavaRelationshipMapping, JavaCollectionMapping2_0 + implements MultiRelationshipMapping2_0, JavaRelationshipMapping, JavaCollectionMapping2_0 { protected final Orderable orderable; 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 57d5052e3a..e6c8146405 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 @@ -17,12 +17,11 @@ 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.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 OneToManyMapping2_0, JavaOneToManyMapping, OrphanRemovalHolder2_0 + implements OneToManyMapping2_0, JavaOneToManyMapping { protected final OrphanRemovable2_0 orphanRemoval; 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 46fd9ab9a1..a98818660d 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 @@ -16,13 +16,12 @@ 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.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 OneToOneMapping2_0, JavaOneToOneMapping, OrphanRemovalHolder2_0 + implements OneToOneMapping2_0, JavaOneToOneMapping { protected final OrphanRemovable2_0 orphanRemoval; 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 3d5da11596..84d5ee5d14 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,7 +17,6 @@ import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.iterable.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; @@ -31,7 +30,9 @@ import org.eclipse.jpt.jpa.core.internal.context.AttributeMappingTools; import org.eclipse.jpt.jpa.core.internal.jpa1.context.java.GenericJavaCascade; 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.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; +import org.eclipse.jpt.jpa.core.jpa2.context.RelationshipMapping2_0; import org.eclipse.jpt.jpa.core.resource.java.RelationshipMappingAnnotation; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -41,7 +42,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMappingAnnotation> extends AbstractJavaAttributeMapping<A> - implements JavaRelationshipMapping + implements JavaRelationshipMapping, RelationshipMapping2_0 { protected String specifiedTargetEntity; protected String defaultTargetEntity; @@ -49,7 +50,7 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp protected final JavaMappingRelationship relationship; - protected final Cascade cascade; + protected final Cascade2_0 cascade; protected FetchType specifiedFetch; protected FetchType defaultFetch; @@ -167,11 +168,11 @@ public abstract class AbstractJavaRelationshipMapping<A extends RelationshipMapp // ********** cascade ********** - public Cascade getCascade() { + public Cascade2_0 getCascade() { return this.cascade; } - protected Cascade buildCascade() { + protected Cascade2_0 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/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index 741b4388e0..c1a70fc930 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 @@ -79,7 +79,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmDiscriminatorColumn; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratorContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmIdClassReference; import org.eclipse.jpt.jpa.core.context.orm.OrmOverrideContainer; @@ -111,7 +110,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.TableValidator; 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.orm.OrmAssociationOverrideContainer2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheableHolder2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmEntity2_0; import org.eclipse.jpt.jpa.core.resource.orm.Inheritance; import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; import org.eclipse.jpt.jpa.core.resource.orm.XmlAssociationOverride; @@ -132,7 +131,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractOrmEntity<X extends XmlEntity> extends AbstractOrmTypeMapping<X> - implements OrmEntity, OrmCacheableHolder2_0, OrmIdClassReference.Owner + implements OrmEntity2_0, OrmIdClassReference.Owner { protected String specifiedName; protected String defaultName; 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 41793436a9..f5447599df 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 @@ -68,6 +68,7 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.NullOrmConverter; import org.eclipse.jpt.jpa.core.internal.jpa2.context.MapKeyJoinColumnValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.jpa.core.jpa2.context.MultiRelationshipMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.PersistentAttribute2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaCollectionMapping2_0; @@ -89,7 +90,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlMultiRelationshipMapping> extends AbstractOrmRelationshipMapping<X> - implements OrmMultiRelationshipMapping, OrmCollectionMapping2_0 + implements OrmMultiRelationshipMapping, OrmCollectionMapping2_0, MultiRelationshipMapping2_0 { protected final Orderable orderable; 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 94657b883d..5975c64740 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 @@ -16,7 +16,6 @@ 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.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.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; @@ -24,7 +23,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToMany; public abstract class AbstractOrmOneToManyMapping<X extends XmlOneToMany> extends AbstractOrmMultiRelationshipMapping<X> - implements OneToManyMapping2_0, OrmOneToManyMapping, OrphanRemovalHolder2_0 + implements OneToManyMapping2_0, OrmOneToManyMapping { protected final OrphanRemovable2_0 orphanRemoval; 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 25f21818cc..1718a14721 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 @@ -17,7 +17,6 @@ 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.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.resource.orm.Attributes; import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; @@ -27,7 +26,7 @@ import org.eclipse.jpt.jpa.core.resource.orm.XmlOneToOne; */ public abstract class AbstractOrmOneToOneMapping<X extends XmlOneToOne> extends AbstractOrmSingleRelationshipMapping<X> - implements OneToOneMapping2_0, OrmOneToOneMapping, OrphanRemovalHolder2_0 + implements OneToOneMapping2_0, OrmOneToOneMapping { protected final OrphanRemovable2_0 orphanRemoval; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index aaf0128737..cc89484e2c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -27,7 +27,6 @@ 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.TypeMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmCascade; import org.eclipse.jpt.jpa.core.context.orm.OrmMappingRelationship; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.context.orm.OrmRelationshipMapping; @@ -37,6 +36,8 @@ import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmCascade; 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.RelationshipMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCascade2_0; import org.eclipse.jpt.jpa.core.resource.orm.AbstractXmlRelationshipMapping; import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -47,7 +48,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; */ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelationshipMapping> extends AbstractOrmAttributeMapping<X> - implements OrmRelationshipMapping + implements OrmRelationshipMapping, RelationshipMapping2_0 { protected String specifiedTargetEntity; protected String defaultTargetEntity; @@ -55,7 +56,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati protected final OrmMappingRelationship relationship; - protected final OrmCascade cascade; + protected final OrmCascade2_0 cascade; protected FetchType specifiedFetch; protected FetchType defaultFetch; @@ -185,11 +186,11 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati // ********** cascade ********** - public OrmCascade getCascade() { + public OrmCascade2_0 getCascade() { return this.cascade; } - protected OrmCascade buildCascade() { + protected OrmCascade2_0 buildCascade() { // NB: we don't use the platform return new GenericOrmCascade(this); } 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 b804b9cb75..36725dc659 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 @@ -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 OrmCascade, Cascade2_0 + implements OrmCascade2_0 { protected boolean all; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ManyToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ManyToManyMapping2_0.java index 51095a4b82..c268492c33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ManyToManyMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/ManyToManyMapping2_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. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; * 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 ManyToManyMapping2_0 - extends ManyToManyMapping, CollectionMapping2_0 + extends ManyToManyMapping, MultiRelationshipMapping2_0 { ManyToManyRelationship getRelationship(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MultiRelationshipMapping2_0.java index a90b1655ee..a409de85b1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaTypeMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MultiRelationshipMapping2_0.java @@ -1,27 +1,30 @@ /******************************************************************************* - * Copyright (c) 2009 Oracle. All rights reserved. + * 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.ui.details.java; +package org.eclipse.jpt.jpa.core.jpa2.context; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.core.context.MultiRelationshipMapping; /** + * JPA 2.0 multi relationship (m:m, 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 3.3 + * @since 3.3 */ -public interface DefaultJavaTypeMappingUiDefinition<M extends TypeMapping> - extends JavaTypeMappingUiDefinition<M>, DefaultMappingUiDefinition<PersistentType, M> +public interface MultiRelationshipMapping2_0 + extends MultiRelationshipMapping, RelationshipMapping2_0, CollectionMapping2_0 { - // combine interfaces -}
\ No newline at end of file + //combine interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToManyMapping2_0.java index e916dad3c0..ee8769762e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToManyMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToManyMapping2_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. @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.OneToManyRelationship; * @since 2.3 */ public interface OneToManyMapping2_0 - extends OneToManyMapping, CollectionMapping2_0 + extends OneToManyMapping, MultiRelationshipMapping2_0, OrphanRemovalHolder2_0 { OneToManyRelationship getRelationship(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToOneMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToOneMapping2_0.java index c9a8427f0d..bcc722e862 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToOneMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/OneToOneMapping2_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. @@ -21,11 +21,11 @@ import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; * 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 OneToOneMapping2_0 - extends OneToOneMapping, SingleRelationshipMapping2_0 + extends OneToOneMapping, SingleRelationshipMapping2_0, OrphanRemovalHolder2_0 { OneToOneRelationship getRelationship(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/RelationshipMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/RelationshipMapping2_0.java new file mode 100644 index 0000000000..e5b07379da --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/RelationshipMapping2_0.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * 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; + +import org.eclipse.jpt.jpa.core.context.RelationshipMapping; + +/** + * JPA 2.0 relationship (1:m, m:m, m:1, 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 3.3 + * @since 3.3 + */ +public interface RelationshipMapping2_0 + extends RelationshipMapping, AttributeMapping2_0 +{ + Cascade2_0 getCascade(); +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SingleRelationshipMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SingleRelationshipMapping2_0.java index a601c7215a..8d25d8a8b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SingleRelationshipMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/SingleRelationshipMapping2_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. @@ -20,11 +20,11 @@ import org.eclipse.jpt.jpa.core.context.SingleRelationshipMapping; * 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 SingleRelationshipMapping2_0 - extends SingleRelationshipMapping, AttributeMapping2_0 + extends SingleRelationshipMapping, RelationshipMapping2_0 { DerivedIdentity2_0 getDerivedIdentity(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaEntity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaEntity2_0.java new file mode 100644 index 0000000000..c1dcba161e --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaEntity2_0.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.core.jpa2.context.java; + +import org.eclipse.jpt.jpa.core.context.java.JavaEntity; + +/** + * Java entity 2.0 + * <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 JavaEntity2_0 + extends JavaEntity, JavaCacheableHolder2_0 +{ + //combine interfaces +} 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 new file mode 100644 index 0000000000..43a92a65ff --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCascade2_0.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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.context.orm.OrmCascade; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; + +/** + * <code>orm.xml</code> 2.0 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 3.3 + * @since 3.3 + */ +public interface OrmCascade2_0 + extends Cascade2_0, OrmCascade +{ + //combine interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmEntity2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmEntity2_0.java new file mode 100644 index 0000000000..13d5af14b5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmEntity2_0.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.core.jpa2.context.orm; + +import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; + +/** + * <code>orm.xml</code> entity + * <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 OrmEntity2_0 + extends OrmEntity, OrmCacheableHolder2_0 +{ + //combine interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmSingleRelationshipMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmSingleRelationshipMapping2_0.java index 5e5c9c1e16..b4adb88077 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmSingleRelationshipMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmSingleRelationshipMapping2_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. @@ -21,11 +21,13 @@ import org.eclipse.jpt.jpa.core.jpa2.context.SingleRelationshipMapping2_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 OrmSingleRelationshipMapping2_0 extends SingleRelationshipMapping2_0, OrmSingleRelationshipMapping { OrmDerivedIdentity2_0 getDerivedIdentity(); + + OrmCascade2_0 getCascade(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping2_0.java new file mode 100644 index 0000000000..0e0566335c --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkIdMapping2_0.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context; + +import org.eclipse.jpt.jpa.core.jpa2.context.IdMapping2_0; + +/** + * EclipseLink ID mapping 2.0 + * <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 EclipseLinkIdMapping2_0 + extends EclipseLinkIdMapping, IdMapping2_0 +{ + //combine interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToManyMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToManyMapping2_0.java new file mode 100644 index 0000000000..fd1141d3ba --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToManyMapping2_0.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context; + +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; + +/** + * EclipseLink ID mapping 2.0 + * <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 EclipseLinkManyToManyMapping2_0 + extends EclipseLinkManyToManyMapping, ManyToManyMapping2_0 +{ + //combine interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToOneMapping.java new file mode 100644 index 0000000000..fda5dc2bc7 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToOneMapping.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2012 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.core.context; + +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; + +/** + * EclipseLink relationship (1:1, 1:m, m:1, 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 3.3 + * @since 3.3 + */ +public interface EclipseLinkManyToOneMapping + extends ManyToOneMapping, EclipseLinkRelationshipMapping, EclipseLinkConvertibleMapping +{ + // combine various interfaces +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToOneMapping2_0.java index be40df986e..9b13a3f0eb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/DefaultJavaAttributeMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkManyToOneMapping2_0.java @@ -1,27 +1,30 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 Oracle. All rights reserved. + * 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.ui.details.java; +package org.eclipse.jpt.jpa.eclipselink.core.context; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; /** + * EclipseLink m:1 mapping 2.0 + * <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 DefaultJavaAttributeMappingUiDefinition<M extends AttributeMapping> - extends JavaAttributeMappingUiDefinition<M>, DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, M> +public interface EclipseLinkManyToOneMapping2_0 + extends EclipseLinkManyToOneMapping, ManyToOneMapping2_0 { - // combine interfaces + //combine interfaces } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java index c417475cc4..167ed5fd0d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/EclipseLinkMappedSuperclass.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 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. @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.context; import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.QueryContainer; /** * Provisional API: This interface is part of an interim API that is still @@ -18,11 +19,11 @@ import org.eclipse.jpt.jpa.core.context.MappedSuperclass; * 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.1 */ public interface EclipseLinkMappedSuperclass extends MappedSuperclass, EclipseLinkNonEmbeddableTypeMapping { - // combine various interfaces + QueryContainer getQueryContainer(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java index 8bf6734d87..93006b0d32 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkIdMapping.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaConverter; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaIdMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; @@ -26,7 +26,9 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class JavaEclipseLinkIdMapping extends AbstractJavaIdMapping - implements EclipseLinkIdMapping, EclipseLinkJavaConvertibleMapping + implements + EclipseLinkIdMapping2_0, + EclipseLinkJavaConvertibleMapping { protected final JavaEclipseLinkMutable mutable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java index 3ab529dcab..7015b62363 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/JavaEclipseLinkManyToManyMapping.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -24,7 +24,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class JavaEclipseLinkManyToManyMapping extends AbstractJavaManyToManyMapping - implements EclipseLinkManyToManyMapping, EclipseLinkJavaConvertibleMapping + implements EclipseLinkManyToManyMapping2_0, EclipseLinkJavaConvertibleMapping { protected final JavaEclipseLinkJoinFetch joinFetch; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java index f30cd04163..ce1374347d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmIdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; @@ -35,7 +35,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class OrmEclipseLinkIdMapping extends AbstractOrmIdMapping<XmlId> implements - EclipseLinkIdMapping, + EclipseLinkIdMapping2_0, EclipseLinkOrmConvertibleMapping, OrmEclipseLinkConverterContainer.Owner { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java index cf58eaa420..91f7e87525 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.jpa.core.internal.context.MappingTools; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmConvertibleMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; @@ -36,7 +36,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IReporter; public class OrmEclipseLinkManyToManyMapping extends AbstractOrmManyToManyMapping<XmlManyToMany> implements - EclipseLinkManyToManyMapping, + EclipseLinkManyToManyMapping2_0, EclipseLinkOrmConvertibleMapping, OrmEclipseLinkConverterContainer.Owner { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkArrayMapping2_3UiDefinition.java deleted file mode 100644 index 7b9fbe3edf..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkArrayMapping2_3UiDefinition.java +++ /dev/null @@ -1,35 +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.eclipselink.ui.internal.details; - -import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; - -public abstract class AbstractEclipseLinkArrayMapping2_3UiDefinition<M, T extends EclipseLinkArrayMapping2_3> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEclipseLinkArrayMapping2_3UiDefinition() { - super(); - } - - public String getKey() { - return EclipseLinkMappingKeys.ARRAY_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages2_0.ArrayMapping2_3_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages2_0.ArrayMapping2_3_linkLabel; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicCollectionMappingUiDefinition.java index 7939f71723..c5c9703b6c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicCollectionMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicCollectionMappingUiDefinition.java @@ -10,11 +10,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; -public abstract class AbstractEclipseLinkBasicCollectionMappingUiDefinition<M, T extends EclipseLinkBasicCollectionMapping> - extends AbstractMappingUiDefinition<M, T> +public abstract class AbstractEclipseLinkBasicCollectionMappingUiDefinition + extends AbstractMappingUiDefinition { protected AbstractEclipseLinkBasicCollectionMappingUiDefinition() { super(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicMapMappingUiDefinition.java deleted file mode 100644 index f61eaf1fc6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkBasicMapMappingUiDefinition.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; - -import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; - -public abstract class AbstractEclipseLinkBasicMapMappingUiDefinition<M, T extends EclipseLinkBasicMapMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEclipseLinkBasicMapMappingUiDefinition() { - super(); - } - - public String getKey() { - return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkBasicMapMappingUiProvider_label; - } - - public String getLinkLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkBasicMapMappingUiProvider_linkLabel; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToManyMappingComposite.java new file mode 100644 index 0000000000..a813e12c68 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToManyMappingComposite.java @@ -0,0 +1,109 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; +import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; +import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.events.ExpansionAdapter; +import org.eclipse.ui.forms.events.ExpansionEvent; +import org.eclipse.ui.forms.widgets.ExpandableComposite; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.eclipse.ui.forms.widgets.Section; + +public abstract class AbstractEclipseLinkManyToManyMappingComposite<T extends EclipseLinkManyToManyMapping, C extends Cascade> + extends AbstractManyToManyMappingComposite<T, ManyToManyRelationship, C> +{ + protected AbstractEclipseLinkManyToManyMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + protected Control initializeManyToManySection(Composite container) { + container = this.addSubPane(container, 2, 0, 0, 0, 0); + + // Target entity widgets + Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); + new TargetEntityClassChooser(this, container, targetEntityHyperlink); + + // Fetch type widgets + this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); + new FetchTypeComboViewer(this, container); + + // Join fetch widgets + this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); + + // Cascade widgets + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 2; + cascadeComposite.getControl().setLayoutData(gridData); + + return container; + } + + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + @Override + protected EclipseLinkJoinFetch buildValue_() { + return this.subject.getJoinFetch(); + } + }; + } + + protected void initializeConvertersCollapsibleSection(Composite container) { + final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE); + section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + section.setText(EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters); + + section.addExpansionListener(new ExpansionAdapter() { + @Override + public void expansionStateChanging(ExpansionEvent e) { + if (e.getState() && section.getClient() == null) { + section.setClient(initializeConvertersSection(section)); + } + } + }); + } + + protected Control initializeConvertersSection(Composite container) { + return new EclipseLinkConvertersComposite(this, this.buildConverterContainerModel(), container).getControl(); + } + + protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { + return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + @Override + protected EclipseLinkConverterContainer buildValue_() { + return this.subject.getConverterContainer(); + } + }; + } + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToOneMappingComposite.java new file mode 100644 index 0000000000..0388443d71 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkManyToOneMappingComposite.java @@ -0,0 +1,113 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; +import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; +import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; +import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.widgets.Hyperlink; + +/** + * Here the layout of this pane: + * <pre> + * ----------------------------------------------------------------------------- + * | ------------------------------------------------------------------------- | + * | | | | + * | | TargetEntityComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | JoiningStrategyComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | FetchTypeComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | OptionalComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | CascadeComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * -----------------------------------------------------------------------------</pre> + */ +public abstract class AbstractEclipseLinkManyToOneMappingComposite<T extends EclipseLinkManyToOneMapping, C extends Cascade> + extends AbstractManyToOneMappingComposite<T, ManyToOneRelationship, C> +{ + protected AbstractEclipseLinkManyToOneMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + protected Control initializeManyToOneSection(Composite container) { + container = this.addSubPane(container, 2, 0, 0, 0, 0); + + // Target entity widgets + Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); + new TargetEntityClassChooser(this, container, targetEntityHyperlink); + + // Fetch type widgets + this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); + new FetchTypeComboViewer(this, container); + + // Join fetch widgets + this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); + + // Optional widgets + OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); + GridData gridData = new GridData(); + gridData.horizontalSpan = 2; + optionalCheckBox.getControl().setLayoutData(gridData); + + // Cascade widgets + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); + gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 2; + cascadeComposite.getControl().setLayoutData(gridData); + + return container; + } + + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + @Override + protected EclipseLinkJoinFetch buildValue_() { + return this.subject.getJoinFetch(); + } + }; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToManyMappingComposite.java new file mode 100644 index 0000000000..333b1e44a5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToManyMappingComposite.java @@ -0,0 +1,129 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; +import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; +import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.events.ExpansionAdapter; +import org.eclipse.ui.forms.events.ExpansionEvent; +import org.eclipse.ui.forms.widgets.ExpandableComposite; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.eclipse.ui.forms.widgets.Section; + +public abstract class AbstractEclipseLinkOneToManyMappingComposite<T extends EclipseLinkOneToManyMapping, C extends Cascade> + extends AbstractOneToManyMappingComposite<T, EclipseLinkOneToManyRelationship, C> +{ + protected AbstractEclipseLinkOneToManyMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + protected Control initializeOneToManySection(Composite container) { + container = this.addSubPane(container, 2, 0, 0, 0, 0); + + // Target entity widgets + Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); + new TargetEntityClassChooser(this, container, targetEntityHyperlink); + + // Fetch type widgets + this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); + new FetchTypeComboViewer(this, container); + + // Join fetch widgets + this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); + + // Private owned widgets + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); + GridData gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 2; + privateOwnedCheckBox.getControl().setLayoutData(gridData); + + // Cascade widgets + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); + gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 2; + cascadeComposite.getControl().setLayoutData(gridData); + + return container; + } + + @Override + protected void initializeJoiningStrategyCollapsibleSection(Composite container) { + new EclipseLinkOneToManyJoiningStrategyPane(this, buildRelationshipModel(), container); + } + + protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { + return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { + @Override + protected EclipseLinkPrivateOwned buildValue_() { + return this.subject.getPrivateOwned(); + } + }; + } + + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + @Override + protected EclipseLinkJoinFetch buildValue_() { + return this.subject.getJoinFetch(); + } + }; + } + + protected void initializeConvertersCollapsibleSection(Composite container) { + final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE); + section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + section.setText(EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters); + + section.addExpansionListener(new ExpansionAdapter() { + @Override + public void expansionStateChanging(ExpansionEvent e) { + if (e.getState() && section.getClient() == null) { + section.setClient(initializeConvertersSection(section)); + } + } + }); + } + + protected Control initializeConvertersSection(Composite container) { + return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); + } + + protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { + return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + @Override + protected EclipseLinkConverterContainer buildValue_() { + return this.subject.getConverterContainer(); + } + }; + } +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToOneMappingComposite.java new file mode 100644 index 0000000000..111a8e7e9e --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkOneToOneMappingComposite.java @@ -0,0 +1,99 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; +import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; +import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; +import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.widgets.Hyperlink; + + +public abstract class AbstractEclipseLinkOneToOneMappingComposite<T extends EclipseLinkOneToOneMapping, C extends Cascade> + extends AbstractOneToOneMappingComposite<T, OneToOneRelationship, C> +{ + protected AbstractEclipseLinkOneToOneMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + protected Control initializeOneToOneSection(Composite container) { + container = this.addSubPane(container, 2, 0, 0, 0, 0); + + // Target entity widgets + Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); + new TargetEntityClassChooser(this, container, targetEntityHyperlink); + + // Fetch type widgets + this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); + new FetchTypeComboViewer(this, container); + + // Join fetch widgets + this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); + + // Optional widgets + OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); + GridData gridData = new GridData(); + gridData.horizontalSpan = 2; + optionalCheckBox.getControl().setLayoutData(gridData); + + // Private owned widgets + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); + gridData = new GridData(); + gridData.horizontalSpan = 2; + privateOwnedCheckBox.getControl().setLayoutData(gridData); + + // Cascade widgets + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); + gridData = new GridData(GridData.FILL_HORIZONTAL); + gridData.horizontalSpan = 2; + cascadeComposite.getControl().setLayoutData(gridData); + + return container; + } + + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + @Override + protected EclipseLinkJoinFetch buildValue_() { + return this.subject.getJoinFetch(); + } + }; + } + + protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { + return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { + @Override + protected EclipseLinkPrivateOwned buildValue_() { + return this.subject.getPrivateOwned(); + } + }; + } +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkStructureMapping2_3UiDefinition.java deleted file mode 100644 index b10df93c27..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkStructureMapping2_3UiDefinition.java +++ /dev/null @@ -1,35 +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.eclipselink.ui.internal.details; - -import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2_3; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; - -public abstract class AbstractEclipseLinkStructureMapping2_3UiDefinition<M, T extends EclipseLinkStructureMapping2_3> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEclipseLinkStructureMapping2_3UiDefinition() { - super(); - } - - public String getKey() { - return EclipseLinkMappingKeys.STRUCTURE_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages2_0.StructureMapping2_3_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages2_0.StructureMapping2_3_linkLabel; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkTransformationMappingUiDefinition.java deleted file mode 100644 index 14e510bc96..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkTransformationMappingUiDefinition.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; - -import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; - -public abstract class AbstractEclipseLinkTransformationMappingUiDefinition<M, T extends EclipseLinkTransformationMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEclipseLinkTransformationMappingUiDefinition() { - super(); - } - - public String getKey() { - return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkTransformationMappingUiProvider_label; - } - - public String getLinkLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkTransformationMappingUiProvider_linkLabel; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkVariableOneToOneMappingUiDefinition.java deleted file mode 100644 index be593b2bfd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/AbstractEclipseLinkVariableOneToOneMappingUiDefinition.java +++ /dev/null @@ -1,34 +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.eclipselink.ui.internal.details; - -import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; - -public abstract class AbstractEclipseLinkVariableOneToOneMappingUiDefinition<M, T extends EclipseLinkVariableOneToOneMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEclipseLinkVariableOneToOneMappingUiDefinition() { - super(); - } - - public String getKey() { - return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkVariableOneToOneMappingUiProvider_label; - } - - public String getLinkLabel() { - return EclipseLinkUiDetailsMessages.EclipseLinkVariableOneToOneMappingUiProvider_linkLabel; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3UiDefinition.java new file mode 100644 index 0000000000..ea1f862f22 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3UiDefinition.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkArrayMapping2_3UiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkArrayMapping2_3UiDefinition INSTANCE = + new EclipseLinkArrayMapping2_3UiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkArrayMapping2_3UiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.ARRAY_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages2_0.ArrayMapping2_3_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages2_0.ArrayMapping2_3_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkArrayMapping2_3Composite((PropertyValueModel<EclipseLinkArrayMapping2_3>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingUiDefinition.java new file mode 100644 index 0000000000..adeab126e2 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingUiDefinition.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkBasicCollectionMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkBasicCollectionMappingUiDefinition INSTANCE = + new EclipseLinkBasicCollectionMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkBasicCollectionMappingUiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.BASIC_COLLECTION_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkBasicCollectionMappingUiProvider_label; + } + + public String getLinkLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkBasicCollectionMappingUiProvider_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkBasicCollectionMappingComposite((PropertyValueModel<EclipseLinkBasicCollectionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingUiDefinition.java new file mode 100644 index 0000000000..82e8e04516 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingUiDefinition.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkBasicMapMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkBasicMapMappingUiDefinition INSTANCE = + new EclipseLinkBasicMapMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkBasicMapMappingUiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.BASIC_MAP_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkBasicMapMappingUiProvider_label; + } + + public String getLinkLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkBasicMapMappingUiProvider_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkBasicMapMappingComposite((PropertyValueModel<EclipseLinkBasicMapMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java index 5f655e563e..ca76c58ff0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransfor import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; -import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.LobConverter; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; @@ -38,7 +37,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> +public abstract class EclipseLinkBasicMappingComposite<T extends EclipseLinkBasicMapping> extends AbstractBasicMappingComposite<T> { protected EclipseLinkBasicMappingComposite( @@ -108,11 +107,11 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> return container; } - protected PropertyValueModel<EclipseLinkMutable> buildMutableHolder() { + protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { - return ((EclipseLinkBasicMapping) this.subject).getMutable(); + return this.subject.getMutable(); } }; } @@ -140,14 +139,14 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> } protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); + return new EclipseLinkConvertersComposite(this, this.buildConverterContainerModel(), container).getControl(); } - protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { + protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkBasicMapping) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java index 82064dbfe3..9d9d6a6c68 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMapping2_0Composite.java @@ -18,7 +18,6 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.ConvertibleMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; @@ -33,7 +32,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends ElementCollectionMapping2_0> +public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends EclipseLinkElementCollectionMapping2_0> extends AbstractElementCollectionMapping2_0Composite<T> { protected EclipseLinkElementCollectionMapping2_0Composite( @@ -69,14 +68,14 @@ public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends } protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); + return new EclipseLinkConvertersComposite(this, this.buildConverterContainerModel(), container).getControl(); } - protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { + protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkElementCollectionMapping2_0) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java index db6157a08a..994d941f66 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java @@ -17,7 +17,6 @@ import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransfor import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.IdMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; @@ -36,7 +35,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> +public abstract class EclipseLinkIdMappingComposite<T extends EclipseLinkIdMapping> extends AbstractIdMappingComposite<T> { protected EclipseLinkIdMappingComposite( @@ -52,8 +51,8 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> protected Control initializeIdSection(Composite container) { container = this.addSubPane(container); - new ColumnComposite(this, buildColumnHolder(), container); - new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); + new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); return container; } @@ -106,11 +105,11 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance()); } - protected PropertyValueModel<EclipseLinkMutable> buildMutableHolder() { + protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { - return ((EclipseLinkIdMapping) this.subject).getMutable(); + return this.subject.getMutable(); } }; } @@ -135,10 +134,10 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<IdMapping, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkIdMapping) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java index 6311096c01..5993a579e0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToManyMappingComposite.java @@ -11,100 +11,20 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; -import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.forms.events.ExpansionAdapter; -import org.eclipse.ui.forms.events.ExpansionEvent; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.Section; -public class EclipseLinkManyToManyMappingComposite<T extends ManyToManyMapping> - extends AbstractManyToManyMappingComposite<T, ManyToManyRelationship> +public class EclipseLinkManyToManyMappingComposite + extends AbstractEclipseLinkManyToManyMappingComposite<EclipseLinkManyToManyMapping, Cascade> { public EclipseLinkManyToManyMappingComposite( - PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - - @Override - protected Control initializeManyToManySection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); - - // Target entity widgets - Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); - new TargetEntityClassChooser(this, container, targetEntityHyperlink); - - // Fetch type widgets - this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); - new FetchTypeComboViewer(this, container); - - // Join fetch widgets - this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); - - // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - cascadeComposite.getControl().setLayoutData(gridData); - - return container; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<ManyToManyMapping, EclipseLinkJoinFetch>(getSubjectHolder()) { - @Override - protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkRelationshipMapping) this.subject).getJoinFetch(); - } - }; - } - - protected void initializeConvertersCollapsibleSection(Composite container) { - final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE); - section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - section.setText(EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters); - - section.addExpansionListener(new ExpansionAdapter() { - @Override - public void expansionStateChanging(ExpansionEvent e) { - if (e.getState() && section.getClient() == null) { - section.setClient(initializeConvertersSection(section)); - } - } - }); - } - - protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); - } - - protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<ManyToManyMapping, EclipseLinkConverterContainer>(getSubjectHolder()) { - @Override - protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkManyToManyMapping) this.subject).getConverterContainer(); - } - }; - } - }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java index 80617dfac7..8296af896e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkManyToOneMappingComposite.java @@ -11,23 +11,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkRelationshipMapping; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; -import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneJoiningStrategyPane; -import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; -import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; -import org.eclipse.swt.layout.GridData; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.forms.widgets.Hyperlink; /** * Here the layout of this pane: @@ -60,55 +47,15 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> */ -public class EclipseLinkManyToOneMappingComposite<T extends ManyToOneMapping> - extends AbstractManyToOneMappingComposite<T, ManyToOneRelationship> +public class EclipseLinkManyToOneMappingComposite + extends AbstractEclipseLinkManyToOneMappingComposite<EclipseLinkManyToOneMapping, Cascade> { public EclipseLinkManyToOneMappingComposite( - PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - - @Override - protected Control initializeManyToOneSection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); - - // Target entity widgets - Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); - new TargetEntityClassChooser(this, container, targetEntityHyperlink); - - // Fetch type widgets - this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); - new FetchTypeComboViewer(this, container); - - // Join fetch widgets - this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); - - // Optional widgets - OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); - GridData gridData = new GridData(); - gridData.horizontalSpan = 2; - optionalCheckBox.getControl().setLayoutData(gridData); - - // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); - gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - cascadeComposite.getControl().setLayoutData(gridData); - - return container; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { - @Override - protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkRelationshipMapping) this.subject).getJoinFetch(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java index 304fc10409..4fe43a602d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyMappingComposite.java @@ -11,122 +11,20 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.OneToManyMapping; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; -import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.forms.events.ExpansionAdapter; -import org.eclipse.ui.forms.events.ExpansionEvent; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.Section; -public class EclipseLinkOneToManyMappingComposite<T extends OneToManyMapping> - extends AbstractOneToManyMappingComposite<T, EclipseLinkOneToManyRelationship> +public class EclipseLinkOneToManyMappingComposite + extends AbstractEclipseLinkOneToManyMappingComposite<EclipseLinkOneToManyMapping, Cascade> { public EclipseLinkOneToManyMappingComposite( - PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - - @Override - protected Control initializeOneToManySection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); - - // Target entity widgets - Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); - new TargetEntityClassChooser(this, container, targetEntityHyperlink); - - // Fetch type widgets - this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); - new FetchTypeComboViewer(this, container); - - // Join fetch widgets - this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); - - // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - privateOwnedCheckBox.getControl().setLayoutData(gridData); - - // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); - gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - cascadeComposite.getControl().setLayoutData(gridData); - - return container; - } - - @Override - protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new EclipseLinkOneToManyJoiningStrategyPane(this, buildJoiningHolder(), container); - } - - protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { - @Override - protected EclipseLinkPrivateOwned buildValue_() { - return ((EclipseLinkOneToManyMapping) this.subject).getPrivateOwned(); - } - }; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { - @Override - protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkOneToManyMapping) this.subject).getJoinFetch(); - } - }; - } - - protected void initializeConvertersCollapsibleSection(Composite container) { - final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE); - section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - section.setText(EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters); - - section.addExpansionListener(new ExpansionAdapter() { - @Override - public void expansionStateChanging(ExpansionEvent e) { - if (e.getState() && section.getClient() == null) { - section.setClient(initializeConvertersSection(section)); - } - } - }); - } - - protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); - } - - protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<OneToManyMapping, EclipseLinkConverterContainer>(getSubjectHolder()) { - @Override - protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkOneToManyMapping) this.subject).getConverterContainer(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java index 43b5677692..e7bf242090 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToOneMappingComposite.java @@ -11,90 +11,21 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; -import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; -import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.ui.forms.widgets.Hyperlink; -public class EclipseLinkOneToOneMappingComposite<T extends OneToOneMapping> - extends AbstractOneToOneMappingComposite<T, OneToOneRelationship> +public class EclipseLinkOneToOneMappingComposite + extends AbstractEclipseLinkOneToOneMappingComposite<EclipseLinkOneToOneMapping, Cascade> { public EclipseLinkOneToOneMappingComposite( - PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - - @Override - protected Control initializeOneToOneSection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); - - // Target entity widgets - Hyperlink targetEntityHyperlink = this.addHyperlink(container, JptUiDetailsMessages.TargetEntityChooser_label); - new TargetEntityClassChooser(this, container, targetEntityHyperlink); - - // Fetch type widgets - this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); - new FetchTypeComboViewer(this, container); - - // Join fetch widgets - this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); - - // Optional widgets - OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); - GridData gridData = new GridData(); - gridData.horizontalSpan = 2; - optionalCheckBox.getControl().setLayoutData(gridData); - - // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); - gridData = new GridData(); - gridData.horizontalSpan = 2; - privateOwnedCheckBox.getControl().setLayoutData(gridData); - - // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); - gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - cascadeComposite.getControl().setLayoutData(gridData); - - return container; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { - @Override - protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkOneToOneMapping)this.subject).getJoinFetch(); - } - }; - } - - protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { - @Override - protected EclipseLinkPrivateOwned buildValue_() { - return ((EclipseLinkOneToOneMapping)this.subject).getPrivateOwned(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3UiDefinition.java new file mode 100644 index 0000000000..6d0f0ccf79 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3UiDefinition.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2_3; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkStructureMapping2_3UiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkStructureMapping2_3UiDefinition INSTANCE = + new EclipseLinkStructureMapping2_3UiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkStructureMapping2_3UiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.STRUCTURE_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages2_0.StructureMapping2_3_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages2_0.StructureMapping2_3_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkStructureMapping2_3Composite((PropertyValueModel<EclipseLinkStructureMapping2_3>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingUiDefinition.java new file mode 100644 index 0000000000..a739dcaf94 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingUiDefinition.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkTransformationMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkTransformationMappingUiDefinition INSTANCE = + new EclipseLinkTransformationMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkTransformationMappingUiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.TRANSFORMATION_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkTransformationMappingUiProvider_label; + } + + public String getLinkLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkTransformationMappingUiProvider_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkTransformationMappingComposite((PropertyValueModel<EclipseLinkTransformationMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingUiDefinition.java new file mode 100644 index 0000000000..8c7ecbe521 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingUiDefinition.java @@ -0,0 +1,63 @@ +/******************************************************************************* + * 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.eclipselink.ui.internal.details; + +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EclipseLinkVariableOneToOneMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EclipseLinkVariableOneToOneMappingUiDefinition INSTANCE = + new EclipseLinkVariableOneToOneMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EclipseLinkVariableOneToOneMappingUiDefinition() { + super(); + } + + public String getKey() { + return EclipseLinkMappingKeys.VARIABLE_ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkVariableOneToOneMappingUiProvider_label; + } + + public String getLinkLabel() { + return EclipseLinkUiDetailsMessages.EclipseLinkVariableOneToOneMappingUiProvider_linkLabel; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkVariableOneToOneMappingComposite((PropertyValueModel<EclipseLinkVariableOneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java index 1202ce3311..04f685687d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java @@ -18,7 +18,6 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.ConvertibleMapping; -import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMutable; @@ -58,7 +57,7 @@ import org.eclipse.ui.forms.widgets.Section; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> */ -public abstract class EclipseLinkVersionMappingComposite<T extends VersionMapping> +public abstract class EclipseLinkVersionMappingComposite<T extends EclipseLinkVersionMapping> extends AbstractVersionMappingComposite<T> { protected EclipseLinkVersionMappingComposite( @@ -74,8 +73,8 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin protected Control initializeVersionSection(Composite container) { container = this.addSubPane(container); - new ColumnComposite(this, buildColumnHolder(), container); - new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); + new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); return container; } @@ -146,11 +145,11 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin }; } - protected PropertyValueModel<EclipseLinkMutable> buildMutableHolder() { + protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { - return ((EclipseLinkVersionMapping) this.subject).getMutable(); + return this.subject.getMutable(); } }; } @@ -171,14 +170,14 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin } protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); + return new EclipseLinkConvertersComposite(this, this.buildConverterContainerModel(), container).getControl(); } - protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<VersionMapping, EclipseLinkConverterContainer>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { + return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { - return ((EclipseLinkVersionMapping) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java index 9fd5a511dd..5d3b264185 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEmbeddableComposite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite; @@ -28,11 +27,11 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractJavaEclipseLinkEmbeddableComposite - extends AbstractEmbeddableComposite<JavaEmbeddable> +public abstract class AbstractJavaEclipseLinkEmbeddableComposite<T extends JavaEclipseLinkEmbeddable> + extends AbstractEmbeddableComposite<T> { protected AbstractJavaEclipseLinkEmbeddableComposite( - PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + PropertyValueModel<? extends T> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -61,14 +60,14 @@ public abstract class AbstractJavaEclipseLinkEmbeddableComposite } protected Control initializeConvertersSection(Composite container) { - return new EclipseLinkConvertersComposite(this, this.buildConverterHolderValueModel(), container).getControl(); + return new EclipseLinkConvertersComposite(this, this.buildConverterContainerValueModel(), container).getControl(); } - protected PropertyValueModel<JavaEclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<JavaEmbeddable, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { + protected PropertyValueModel<JavaEclipseLinkConverterContainer> buildConverterContainerValueModel() { + return new PropertyAspectAdapter<T, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected JavaEclipseLinkConverterContainer buildValue_() { - return ((JavaEclipseLinkEmbeddable) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java index e14672c9d0..f9237fec7d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntity2_xComposite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo; @@ -29,11 +27,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -public abstract class AbstractJavaEclipseLinkEntity2_xComposite - extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> +public abstract class AbstractJavaEclipseLinkEntity2_xComposite<T extends JavaEclipseLinkEntity> + extends AbstractJavaEclipseLinkEntityComposite<T> { protected AbstractJavaEclipseLinkEntity2_xComposite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends T> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -56,24 +54,15 @@ public abstract class AbstractJavaEclipseLinkEntity2_xComposite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaEntity, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } - @Override protected Control initializeAttributeOverridesSection(Composite container) { return new Entity2_0OverridesComposite(this, container).getControl(); @@ -81,16 +70,16 @@ public abstract class AbstractJavaEclipseLinkEntity2_xComposite @Override protected Control initializeGeneratorsSection(Composite container) { - return new Generation2_0Composite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new Generation2_0Composite(this, this.buildGeneratorContainerModel(), container).getControl(); } @Override protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } @Override protected Control initializeQueriesSection(Composite container) { - return new Queries2_0Composite(this, this.buildQueryContainerHolder(), container).getControl(); + return new Queries2_0Composite(this, this.buildQueryContainerModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java index 7f73f4c412..71c0fa6dbe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; @@ -31,7 +30,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntity> +public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEclipseLinkEntity> extends AbstractEntityComposite<T> { protected AbstractJavaEclipseLinkEntityComposite( @@ -72,14 +71,14 @@ public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntit } protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching> buildCachingHolder() { - return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapter<T, JavaEclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapter<T, JavaEclipseLinkCaching>(getSubjectHolder()) { @Override protected JavaEclipseLinkCaching buildValue_() { - return ((JavaEclipseLinkEntity) this.subject).getCaching(); + return this.subject.getCaching(); } }; } @@ -104,10 +103,10 @@ public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntit } private PropertyValueModel<JavaEclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected JavaEclipseLinkConverterContainer buildValue_() { - return ((JavaEclipseLinkEntity) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java index f6e5f25b55..e26771af64 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java @@ -14,9 +14,6 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; -import org.eclipse.jpt.jpa.core.context.MappedSuperclass; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkCaching; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; @@ -34,11 +31,11 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite - extends AbstractJavaMappedSuperclassComposite +public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite<T extends JavaEclipseLinkMappedSuperclass> + extends AbstractJavaMappedSuperclassComposite<T> { protected AbstractJavaEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends T> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -71,14 +68,14 @@ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite } protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCachingComposite(this, buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching> buildCachingHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapter<T, JavaEclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapter<T, JavaEclipseLinkCaching>(getSubjectHolder()) { @Override protected JavaEclipseLinkCaching buildValue_() { - return ((JavaEclipseLinkMappedSuperclass) this.subject).getCaching(); + return this.subject.getCaching(); } }; } @@ -103,10 +100,10 @@ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite } private PropertyValueModel<JavaEclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, JavaEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected JavaEclipseLinkConverterContainer buildValue_() { - return ((JavaEclipseLinkMappedSuperclass) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } @@ -146,14 +143,14 @@ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite } protected Control initializeGeneratorsSection(Composite container) { - return new Generation2_0Composite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new Generation2_0Composite(this, this.buildGeneratorContainerModel(), container).getControl(); } - protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerHolder() { - return new PropertyAspectAdapter<MappedSuperclass, GeneratorContainer>(getSubjectHolder()) { + protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { + return new PropertyAspectAdapter<T, GeneratorContainer>(this.getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { - return ((EclipseLinkMappedSuperclass) this.subject).getGeneratorContainer(); + return this.subject.getGeneratorContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java index ce596aecf6..bc8267da62 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java @@ -9,22 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; public class DefaultJavaEclipseLinkOneToManyMappingUiDefinition - extends AbstractOneToManyMappingUiDefinition<ReadOnlyPersistentAttribute, JavaOneToManyMapping> - implements DefaultJavaAttributeMappingUiDefinition<JavaOneToManyMapping> + extends AbstractOneToManyMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final DefaultJavaEclipseLinkOneToManyMappingUiDefinition INSTANCE = new DefaultJavaEclipseLinkOneToManyMappingUiDefinition(); @@ -32,39 +24,32 @@ public class DefaultJavaEclipseLinkOneToManyMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<JavaOneToManyMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } - - + + /** * Ensure single instance. */ private DefaultJavaEclipseLinkOneToManyMappingUiDefinition() { super(); } - - - @Override + + public String getKey() { return null; } - + public String getDefaultKey() { return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - - @Override + public String getLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_label; } - - @Override + public String getLinkLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java index d4350c0106..fc51cb8b42 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToOneMappingUiDefinition.java @@ -9,22 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; public class DefaultJavaEclipseLinkOneToOneMappingUiDefinition - extends AbstractOneToOneMappingUiDefinition<ReadOnlyPersistentAttribute, JavaOneToOneMapping> - implements DefaultJavaAttributeMappingUiDefinition<JavaOneToOneMapping> + extends AbstractOneToOneMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final DefaultJavaEclipseLinkOneToOneMappingUiDefinition INSTANCE = new DefaultJavaEclipseLinkOneToOneMappingUiDefinition(); @@ -32,39 +24,31 @@ public class DefaultJavaEclipseLinkOneToOneMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<JavaOneToOneMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } - - + + /** * Ensure single instance. */ private DefaultJavaEclipseLinkOneToOneMappingUiDefinition() { super(); } - - - @Override + public String getKey() { return null; } - + public String getDefaultKey() { return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - - @Override + public String getLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_label; } - - @Override + public String getLinkLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java index 6890c87202..27300e16f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.java @@ -12,20 +12,20 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.eclipselink.core.EclipseLinkMappingKeys; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; import org.eclipse.swt.widgets.Composite; public class DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition - extends AbstractMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkVariableOneToOneMapping> - implements DefaultJavaAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> + extends AbstractMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition INSTANCE = new DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition(); @@ -33,7 +33,7 @@ public class DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } @@ -61,7 +61,8 @@ public class DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition return EclipseLinkUiDetailsMessages.DefaultEclipseLinkVariableOneToOneMappingUiProvider_linkLabel; } - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return new EclipseLinkVariableOneToOneMappingComposite((PropertyValueModel<EclipseLinkVariableOneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaResourceUiDefinition.java index fab2a72210..77f629ee02 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaResourceUiDefinition.java @@ -10,29 +10,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedIdMappingUDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.NullJavaAttributeMappingUiDefinition; public class EclipseLink1_2JavaResourceUiDefinition @@ -57,30 +55,30 @@ public class EclipseLink1_2JavaResourceUiDefinition } @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLink1_2JavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(JavaIdMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkTransformationMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); } @Override - protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { + protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); definitions.add(NullJavaAttributeMappingUiDefinition.instance()); @@ -88,11 +86,4 @@ public class EclipseLink1_2JavaResourceUiDefinition definitions.add(DefaultJavaEclipseLinkOneToManyMappingUiDefinition.instance()); definitions.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo(List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java index fe20dbbb69..6c02710b4b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink1_2JavaUiFactory.java @@ -12,9 +12,12 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; @@ -23,30 +26,33 @@ public class EclipseLink1_2JavaUiFactory { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkMappedSuperclass1_2Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkMappedSuperclass1_2Composite((PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEntity1_2Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkEntity1_2Composite((PropertyValueModel<? extends JavaEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEmbeddable1_2Composite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkEmbeddable1_2Composite((PropertyValueModel<? extends JavaEclipseLinkEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaResourceUiDefinition.java index bab151acc5..fd33969882 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaResourceUiDefinition.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,30 +10,28 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedIdMappingUDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.NullJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.JavaElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLink2_0JavaResourceUiDefinition extends AbstractJavaResourceUiDefinition @@ -59,37 +57,33 @@ public class EclipseLink2_0JavaResourceUiDefinition @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLink2_0JavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo( - List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { definitions.add(JavaEclipseLinkIdMapping2_0UiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(JavaElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } @Override - protected void addDefaultAttributeMappingUiDefinitionsTo( - List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { - + protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); definitions.add(NullJavaAttributeMappingUiDefinition.instance()); @@ -97,13 +91,4 @@ public class EclipseLink2_0JavaResourceUiDefinition definitions.add(DefaultJavaEclipseLinkOneToManyMappingUiDefinition.instance()); definitions.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo( - List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java index 405261842d..5d50f62446 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_0JavaUiFactory.java @@ -12,113 +12,131 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedIdMapping2_0Composite; -import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0; +import org.eclipse.jpt.jpa.ui.jpa2.details.JpaUiFactory2_0; import org.eclipse.swt.widgets.Composite; public class EclipseLink2_0JavaUiFactory extends EclipseLink1_2JavaUiFactory - implements JavaUiFactory2_0 + implements JpaUiFactory2_0 { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkEntity2_0Composite((PropertyValueModel<? extends JavaEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkMappedSuperclass2_0Composite((PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkIdMapping2_0Composite((PropertyValueModel<? extends EclipseLinkIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddedIdMappingComposite( - PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EmbeddedIdMapping2_0Composite((PropertyValueModel<? extends EmbeddedIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaElementCollectionMapping2_0Composite( - PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, + @SuppressWarnings("unchecked") + public JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkElementCollectionMapping2_0Composite((PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkOneToManyMapping2_0Composite((PropertyValueModel<? extends EclipseLinkOneToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkOneToOneMapping2_0Composite((PropertyValueModel<? extends EclipseLinkOneToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkManyToOneMapping2_0Composite((PropertyValueModel<? extends EclipseLinkManyToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkManyToManyMapping2_0Composite((PropertyValueModel<? extends EclipseLinkManyToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaResourceUiDefinition.java index c8789789c5..8596e292d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaResourceUiDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -10,30 +10,30 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedIdMappingUDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.NullJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.JavaElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLink2_3JavaResourceUiDefinition extends AbstractJavaResourceUiDefinition @@ -59,39 +59,35 @@ public class EclipseLink2_3JavaResourceUiDefinition @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLink2_3JavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo( - List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { definitions.add(JavaEclipseLinkIdMapping2_0UiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); - - definitions.add(JavaEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkArrayMapping2_3UiDefinition.instance()); - definitions.add(JavaEclipseLinkStructureMapping2_3UiDefinition.instance()); - - definitions.add(JavaElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); + + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkArrayMapping2_3UiDefinition.instance()); + definitions.add(EclipseLinkStructureMapping2_3UiDefinition.instance()); + + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } @Override - protected void addDefaultAttributeMappingUiDefinitionsTo( - List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { - + protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); definitions.add(NullJavaAttributeMappingUiDefinition.instance()); @@ -99,13 +95,4 @@ public class EclipseLink2_3JavaResourceUiDefinition definitions.add(DefaultJavaEclipseLinkOneToManyMappingUiDefinition.instance()); definitions.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo( - List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java index b447d4b3de..29b72656a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLink2_3JavaUiFactory.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; @@ -22,21 +24,23 @@ public class EclipseLink2_3JavaUiFactory { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, - Composite parent, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, + Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEntity2_3Composite(entityModel, parent, widgetFactory, resourceManager); + return new JavaEclipseLinkEntity2_3Composite((PropertyValueModel<? extends JavaEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, - Composite parent, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, + Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parent, widgetFactory, resourceManager); + return new JavaEclipseLinkMappedSuperclass2_3Composite((PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaResourceUiDefinition.java index cc2eb3d14b..20cbce44a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaResourceUiDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 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,29 +10,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedIdMappingUDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.NullJavaAttributeMappingUiDefinition; public class EclipseLinkJavaResourceUiDefinition @@ -59,33 +57,31 @@ public class EclipseLinkJavaResourceUiDefinition @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkJavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo( - List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - - definitions.add(JavaIdMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(JavaEclipseLinkTransformationMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); } @Override protected void addDefaultAttributeMappingUiDefinitionsTo( - List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { + List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); @@ -94,13 +90,4 @@ public class EclipseLinkJavaResourceUiDefinition definitions.add(DefaultJavaEclipseLinkOneToManyMappingUiDefinition.instance()); definitions.add(DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo( - List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java index 83a35414dc..2b52ff662c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java @@ -12,28 +12,30 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -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.JavaVersionMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingComposite; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingComposite; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToOneMappingComposite; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingComposite; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaUiFactory; import org.eclipse.swt.widgets.Composite; @@ -42,140 +44,115 @@ public class EclipseLinkJavaUiFactory extends AbstractJavaUiFactory { // ********** type mappings ********** - + @Override - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + @SuppressWarnings("unchecked") + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkMappedSuperclassComposite((PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkEntityComposite((PropertyValueModel<? extends JavaEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkEmbeddableComposite((PropertyValueModel<? extends JavaEclipseLinkEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkIdMappingComposite((PropertyValueModel<? extends EclipseLinkIdMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaBasicMappingComposite( - PropertyValueModel<JavaBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkBasicMappingComposite((PropertyValueModel<? extends EclipseLinkBasicMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaVersionMappingComposite( - PropertyValueModel<JavaVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEclipseLinkVersionMappingComposite((PropertyValueModel<? extends EclipseLinkVersionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EclipseLinkManyToOneMappingComposite((PropertyValueModel<? extends EclipseLinkManyToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EclipseLinkOneToManyMappingComposite((PropertyValueModel<? extends EclipseLinkOneToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EclipseLinkOneToOneMappingComposite((PropertyValueModel<? extends EclipseLinkOneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public JpaComposite createJavaEclipseLinkBasicMapMappingComposite( - PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public JpaComposite createJavaEclipseLinkBasicCollectionMappingComposite( - PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public JpaComposite createJavaEclipseLinkVariableOneToOneMappingComposite( - PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public JpaComposite createJavaEclipseLinkTransformationMappingComposite( - PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EclipseLinkManyToManyMappingComposite((PropertyValueModel<? extends EclipseLinkManyToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java deleted file mode 100644 index d1427a16e9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkArrayMapping2_3UiDefinition.java +++ /dev/null @@ -1,52 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkArrayMapping2_3UiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3Composite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkArrayMapping2_3UiDefinition - extends AbstractEclipseLinkArrayMapping2_3UiDefinition<ReadOnlyPersistentAttribute, EclipseLinkArrayMapping2_3> - implements JavaAttributeMappingUiDefinition<EclipseLinkArrayMapping2_3> -{ - // singleton - private static final JavaEclipseLinkArrayMapping2_3UiDefinition INSTANCE = - new JavaEclipseLinkArrayMapping2_3UiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkArrayMapping2_3> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkArrayMapping2_3UiDefinition() { - super(); - } - - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkArrayMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkArrayMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java deleted file mode 100644 index a5496453d4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicCollectionMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkBasicCollectionMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkBasicCollectionMappingUiDefinition - extends AbstractEclipseLinkBasicCollectionMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkBasicCollectionMapping> - implements JavaAttributeMappingUiDefinition<EclipseLinkBasicCollectionMapping> -{ - // singleton - private static final JavaEclipseLinkBasicCollectionMappingUiDefinition INSTANCE = - new JavaEclipseLinkBasicCollectionMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkBasicCollectionMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkBasicCollectionMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java deleted file mode 100644 index 681c123e79..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMapMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkBasicMapMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkBasicMapMappingUiDefinition - extends AbstractEclipseLinkBasicMapMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkBasicMapMapping> - implements JavaAttributeMappingUiDefinition<EclipseLinkBasicMapMapping> -{ - // singleton - private static final JavaEclipseLinkBasicMapMappingUiDefinition INSTANCE = - new JavaEclipseLinkBasicMapMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkBasicMapMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkBasicMapMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java index 8019011f18..4c05e2519d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkBasicMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite; @@ -24,10 +24,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class JavaEclipseLinkBasicMappingComposite - extends EclipseLinkBasicMappingComposite<BasicMapping> + extends EclipseLinkBasicMappingComposite<EclipseLinkBasicMapping> { public JavaEclipseLinkBasicMappingComposite( - PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -47,7 +47,7 @@ public class JavaEclipseLinkBasicMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -63,7 +63,7 @@ public class JavaEclipseLinkBasicMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java index 2abc55b4a3..b109f38e68 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite; @@ -30,10 +29,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkElementCollectionMapping2_0Composite - extends EclipseLinkElementCollectionMapping2_0Composite<JavaElementCollectionMapping2_0> + extends EclipseLinkElementCollectionMapping2_0Composite<EclipseLinkElementCollectionMapping2_0> { public JavaEclipseLinkElementCollectionMapping2_0Composite( - PropertyValueModel<? extends JavaElementCollectionMapping2_0> mappingModel, + PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -55,10 +54,10 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Collection table widgets - CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableHolder(), container); + CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; collectionTableComposite.getControl().setLayoutData(gridData); @@ -66,11 +65,11 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite return container; } - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchHolder() { - return new PropertyAspectAdapter<JavaElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkElementCollectionMapping2_0) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java index 28e1f54760..41ca116d91 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddable1_2Composite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.swt.widgets.Composite; @@ -20,10 +20,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Section; public class JavaEclipseLinkEmbeddable1_2Composite - extends AbstractJavaEclipseLinkEmbeddableComposite + extends AbstractJavaEclipseLinkEmbeddableComposite<JavaEclipseLinkEmbeddable> { public JavaEclipseLinkEmbeddable1_2Composite( - PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + PropertyValueModel<? extends JavaEclipseLinkEmbeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java index 7b1bfb618d..ca722772c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java @@ -12,16 +12,16 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEmbeddable; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Section; public class JavaEclipseLinkEmbeddableComposite - extends AbstractJavaEclipseLinkEmbeddableComposite + extends AbstractJavaEclipseLinkEmbeddableComposite<JavaEclipseLinkEmbeddable> { public JavaEclipseLinkEmbeddableComposite( - PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + PropertyValueModel<? extends JavaEclipseLinkEmbeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java index 4a87353e71..417982dff7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity1_2Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo; @@ -27,10 +25,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkEntity1_2Composite - extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> + extends AbstractJavaEclipseLinkEntityComposite<JavaEclipseLinkEntity> { public JavaEclipseLinkEntity1_2Composite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends JavaEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -53,21 +51,12 @@ public class JavaEclipseLinkEntity1_2Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaEntity, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java index adc68e70b0..1140465bd4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_0Composite.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,14 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkEntity2_0Composite - extends AbstractJavaEclipseLinkEntity2_xComposite + extends AbstractJavaEclipseLinkEntity2_xComposite<JavaEclipseLinkEntity> { public JavaEclipseLinkEntity2_0Composite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends JavaEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java index f01ae1ba2a..11acb51d94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntity2_3Composite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMultitenancy2_3; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMultitenancyComposite; @@ -27,10 +26,10 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class JavaEclipseLinkEntity2_3Composite - extends AbstractJavaEclipseLinkEntity2_xComposite + extends AbstractJavaEclipseLinkEntity2_xComposite<JavaEclipseLinkEntity> { public JavaEclipseLinkEntity2_3Composite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends JavaEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -67,14 +66,14 @@ public class JavaEclipseLinkEntity2_3Composite } protected Control initializeMultitenancySection(Composite container) { - return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyHolder(), container).getControl(); + return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<JavaEntity, JavaEclipseLinkMultitenancy2_3> buildMultitenancyHolder() { - return new PropertyAspectAdapter<JavaEntity, JavaEclipseLinkMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapter<JavaEclipseLinkEntity, JavaEclipseLinkMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapter<JavaEclipseLinkEntity, JavaEclipseLinkMultitenancy2_3>(getSubjectHolder()) { @Override protected JavaEclipseLinkMultitenancy2_3 buildValue_() { - return ((JavaEclipseLinkEntity) this.subject).getMultitenancy(); + return this.subject.getMultitenancy(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java index 0d03fa523f..c282975785 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEntityComposite.java @@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkEntityComposite - extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> + extends AbstractJavaEclipseLinkEntityComposite<JavaEclipseLinkEntity> { public JavaEclipseLinkEntityComposite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends JavaEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java index 1c92b42d00..6415b04d93 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0Composite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkIdMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite; @@ -22,10 +22,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class JavaEclipseLinkIdMapping2_0Composite - extends EclipseLinkIdMappingComposite<JavaIdMapping> + extends EclipseLinkIdMappingComposite<EclipseLinkIdMapping2_0> { public JavaEclipseLinkIdMapping2_0Composite( - PropertyValueModel<? extends JavaIdMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkIdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -47,9 +47,9 @@ public class JavaEclipseLinkIdMapping2_0Composite container = this.addSubPane(container); new IdMapping2_0MappedByRelationshipPane(this, getSubjectHolder(), container); - new ColumnComposite(this, buildColumnHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); - new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); return container; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0UiDefinition.java index 440e1e8cc0..7fb147ff5b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMapping2_0UiDefinition.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,13 +11,13 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; public class JavaEclipseLinkIdMapping2_0UiDefinition - extends JavaIdMappingUiDefinition + extends IdMappingUiDefinition { // singleton private static final JavaEclipseLinkIdMapping2_0UiDefinition INSTANCE = @@ -27,7 +27,7 @@ public class JavaEclipseLinkIdMapping2_0UiDefinition /** * Return the singleton */ - public static JavaAttributeMappingUiDefinition<JavaIdMapping> instance() { + public static MappingUiDefinition instance() { return INSTANCE; } @@ -41,11 +41,11 @@ public class JavaEclipseLinkIdMapping2_0UiDefinition @Override - public boolean isEnabledFor(ReadOnlyPersistentAttribute mappableObject) { + public boolean isEnabledFor(JpaContextNode node) { // a default eclipselink 1-1 mapping can not be mapped as an id, as mapping it // that way will actually result in a default 1-1 with an id derived identity return ObjectTools.notEquals( - mappableObject.getDefaultMappingKey(), + ((ReadOnlyPersistentAttribute) node).getDefaultMappingKey(), MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java index 24f1837efa..234a4194da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java @@ -12,15 +12,15 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkIdMappingComposite; import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkIdMappingComposite - extends EclipseLinkIdMappingComposite<IdMapping> + extends EclipseLinkIdMappingComposite<EclipseLinkIdMapping> { public JavaEclipseLinkIdMappingComposite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java index aef4720eea..3b77b1d693 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java @@ -11,12 +11,11 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; @@ -29,10 +28,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkManyToManyMapping2_0Composite - extends EclipseLinkManyToManyMappingComposite<ManyToManyMapping> + extends AbstractEclipseLinkManyToManyMappingComposite<EclipseLinkManyToManyMapping2_0, Cascade2_0> { public JavaEclipseLinkManyToManyMapping2_0Composite( - PropertyValueModel<? extends ManyToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,10 +61,10 @@ public class JavaEclipseLinkManyToManyMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchModel(), container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -77,13 +76,4 @@ public class JavaEclipseLinkManyToManyMapping2_0Composite protected Control initializeOrderingSection(Composite container) { return new Ordering2_0Composite(this, container).getControl(); } - - protected PropertyValueModel<ManyToManyRelationship> buildEclipseLinkJoiningHolder() { - return new TransformationPropertyValueModel<ManyToManyMapping, ManyToManyRelationship>(this.getSubjectHolder()) { - @Override - protected ManyToManyRelationship transform_(ManyToManyMapping value) { - return value.getRelationship(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java index 94759b084b..fb455d5e0d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java @@ -13,10 +13,10 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToOneRelationship2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; @@ -31,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkManyToOneMapping2_0Composite - extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationship2_0> + extends AbstractManyToOneMapping2_0Composite<EclipseLinkManyToOneMapping2_0, JavaManyToOneRelationship2_0, Cascade2_0> { public JavaEclipseLinkManyToOneMapping2_0Composite( - PropertyValueModel<? extends JavaManyToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -57,7 +57,7 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -66,7 +66,7 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -74,11 +74,11 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite return container; } - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<JavaManyToOneMapping, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkJoinFetchMapping) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java index 8d04f01b8f..4a61e82295 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass1_2Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser; @@ -24,10 +22,17 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkMappedSuperclass1_2Composite - extends AbstractJavaEclipseLinkMappedSuperclassComposite + extends AbstractJavaEclipseLinkMappedSuperclassComposite<JavaEclipseLinkMappedSuperclass> { + /** + * Creates a new <code>JavaEclipseLinkMappedSuperclass1_2Composite</code>. + * + * @param subjectModel The holder of this pane's subject + * @param parent The parent container + * @param widgetFactory The factory used to create various common widgets + */ public JavaEclipseLinkMappedSuperclass1_2Composite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -40,21 +45,12 @@ public class JavaEclipseLinkMappedSuperclass1_2Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } -}
\ No newline at end of file +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java index 2f88bd4ac4..51e6952e22 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser; @@ -24,10 +22,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkMappedSuperclass2_0Composite - extends AbstractJavaEclipseLinkMappedSuperclassComposite + extends AbstractJavaEclipseLinkMappedSuperclassComposite<JavaEclipseLinkMappedSuperclass> { public JavaEclipseLinkMappedSuperclass2_0Composite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -40,26 +38,17 @@ public class JavaEclipseLinkMappedSuperclass2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } - @Override protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } -}
\ No newline at end of file +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java index a6b22f1cc0..1ecc1f00c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_1Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.IdClassChooser; @@ -24,10 +22,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkMappedSuperclass2_1Composite - extends AbstractJavaEclipseLinkMappedSuperclassComposite + extends AbstractJavaEclipseLinkMappedSuperclassComposite<JavaEclipseLinkMappedSuperclass> { public JavaEclipseLinkMappedSuperclass2_1Composite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -50,26 +48,17 @@ public class JavaEclipseLinkMappedSuperclass2_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } - @Override protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java index a0bfa31b8b..d34adfae8d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclass2_3Composite.java @@ -13,8 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMultitenancy2_3; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMultitenancyComposite; @@ -33,10 +31,10 @@ import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; public class JavaEclipseLinkMappedSuperclass2_3Composite - extends AbstractJavaEclipseLinkMappedSuperclassComposite + extends AbstractJavaEclipseLinkMappedSuperclassComposite<JavaEclipseLinkMappedSuperclass> { public JavaEclipseLinkMappedSuperclass2_3Composite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -60,27 +58,18 @@ public class JavaEclipseLinkMappedSuperclass2_3Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } - @Override protected Control initializeCachingSection(Composite container) { - return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } protected void initializeMultitenancyCollapsibleSection(Composite container) { @@ -99,14 +88,14 @@ public class JavaEclipseLinkMappedSuperclass2_3Composite } protected Control initializeMultitenancySection(Composite container) { - return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyHolder(), container).getControl(); + return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkMultitenancy2_3> buildMultitenancyHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, JavaEclipseLinkMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapter<JavaEclipseLinkMappedSuperclass, JavaEclipseLinkMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapter<JavaEclipseLinkMappedSuperclass, JavaEclipseLinkMultitenancy2_3>(getSubjectHolder()) { @Override protected JavaEclipseLinkMultitenancy2_3 buildValue_() { - return ((JavaEclipseLinkMappedSuperclass) this.subject).getMultitenancy(); + return this.subject.getMultitenancy(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java index e081e30b5b..2f5847f782 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java @@ -12,17 +12,17 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass; import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkMappedSuperclassComposite - extends AbstractJavaEclipseLinkMappedSuperclassComposite + extends AbstractJavaEclipseLinkMappedSuperclassComposite<JavaEclipseLinkMappedSuperclass> { public JavaEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends JavaEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } -}
\ No newline at end of file +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java index 1bca1dbdc3..348e0e42bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java @@ -13,11 +13,11 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_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.eclipselink.core.context.EclipseLinkOneToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; @@ -32,10 +32,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkOneToManyMapping2_0Composite - extends EclipseLinkOneToManyMappingComposite<JavaOneToManyMapping> + extends AbstractEclipseLinkOneToManyMappingComposite<EclipseLinkOneToManyMapping2_0, Cascade2_0> { public JavaEclipseLinkOneToManyMapping2_0Composite( - PropertyValueModel<? extends JavaOneToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -65,22 +65,22 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchModel(), container); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableHolder(), container); + OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; orphanRemovalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -93,11 +93,11 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite return new Ordering2_0Composite(this, container).getControl(); } - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<JavaOneToManyMapping, OrphanRemovable2_0>(this.getSubjectHolder()) { + protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { + return new PropertyAspectAdapter<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getOrphanRemoval(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java index f1d4f3a2ac..ad061c0585 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java @@ -13,12 +13,10 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -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.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneRelationship2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; @@ -37,10 +35,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEclipseLinkOneToOneMapping2_0Composite - extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationship2_0> + extends AbstractOneToOneMapping2_0Composite<EclipseLinkOneToOneMapping2_0, JavaOneToOneRelationship2_0, Cascade2_0> { public JavaEclipseLinkOneToOneMapping2_0Composite( - PropertyValueModel<? extends JavaOneToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,7 +60,7 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -71,19 +69,19 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableHolder(), container); + OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; orphanRemovalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -93,32 +91,23 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); + new OneToOneJoiningStrategy2_0Pane(this, buildRelationshipModel(), container); } - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<JavaOneToOneMapping, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkOneToOneMapping) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } - protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { - return new PropertyAspectAdapter<JavaOneToOneMapping, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { + return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { - return ((EclipseLinkOneToOneMapping) this.subject).getPrivateOwned(); - } - }; - } - - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<JavaOneToOneMapping, OrphanRemovable2_0>(this.getSubjectHolder()) { - @Override - protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getPrivateOwned(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java deleted file mode 100644 index 680704451b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkStructureMapping2_3UiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2_3; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkStructureMapping2_3UiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3Composite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkStructureMapping2_3UiDefinition - extends AbstractEclipseLinkStructureMapping2_3UiDefinition<ReadOnlyPersistentAttribute, EclipseLinkStructureMapping2_3> - implements JavaAttributeMappingUiDefinition<EclipseLinkStructureMapping2_3> -{ - // singleton - private static final JavaEclipseLinkStructureMapping2_3UiDefinition INSTANCE = - new JavaEclipseLinkStructureMapping2_3UiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkStructureMapping2_3> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkStructureMapping2_3UiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkStructureMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkStructureMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java deleted file mode 100644 index dc7ab62928..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkTransformationMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkTransformationMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkTransformationMappingUiDefinition - extends AbstractEclipseLinkTransformationMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkTransformationMapping> - implements JavaAttributeMappingUiDefinition<EclipseLinkTransformationMapping> -{ - // singleton - private static final JavaEclipseLinkTransformationMappingUiDefinition INSTANCE = - new JavaEclipseLinkTransformationMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkTransformationMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkTransformationMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java deleted file mode 100644 index a94b200c6b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVariableOneToOneMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkVariableOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class JavaEclipseLinkVariableOneToOneMappingUiDefinition - extends AbstractEclipseLinkVariableOneToOneMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkVariableOneToOneMapping> - implements JavaAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> -{ - // singleton - private static final JavaEclipseLinkVariableOneToOneMappingUiDefinition INSTANCE = - new JavaEclipseLinkVariableOneToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEclipseLinkVariableOneToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java index 4cc6f9e929..47476e2523 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkVersionMappingComposite.java @@ -12,15 +12,15 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVersionMappingComposite; import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkVersionMappingComposite - extends EclipseLinkVersionMappingComposite<VersionMapping> + extends EclipseLinkVersionMappingComposite<EclipseLinkVersionMapping> { public JavaEclipseLinkVersionMappingComposite( - PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java index 348c8ca805..27e9b5a4d0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java @@ -12,19 +12,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -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.OrmTransientMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlUiFactory; import org.eclipse.swt.widgets.Composite; @@ -33,113 +41,113 @@ public abstract class AbstractEclipseLinkOrmXmlUiFactory { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkMappedSuperclassComposite((PropertyValueModel<OrmEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEntityComposite((PropertyValueModel<OrmEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEmbeddableComposite( - PropertyValueModel<OrmEmbeddable> embeddableModel, + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEmbeddableComposite((PropertyValueModel<OrmEclipseLinkEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkIdMappingComposite((PropertyValueModel<? extends EclipseLinkIdMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkBasicMappingComposite((PropertyValueModel<? extends EclipseLinkBasicMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkVersionMappingComposite((PropertyValueModel<? extends EclipseLinkVersionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToOneMappingComposite((PropertyValueModel<? extends EclipseLinkManyToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToManyMappingComposite((PropertyValueModel<? extends EclipseLinkOneToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToOneMappingComposite((PropertyValueModel<? extends EclipseLinkOneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - @Override - public JpaComposite createOrmTransientMappingComposite( - PropertyValueModel<OrmTransientMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToManyMappingComposite((PropertyValueModel<? extends EclipseLinkManyToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java index b380e13f29..8803dc9c43 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntity2_xComposite.java @@ -12,18 +12,18 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Entity2_0OverridesComposite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Generation2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Queries2_0Composite; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -public abstract class AbstractOrmEclipseLinkEntity2_xComposite - extends AbstractOrmEclipseLinkEntityComposite +public abstract class AbstractOrmEclipseLinkEntity2_xComposite<T extends OrmEclipseLinkEntity> + extends AbstractOrmEclipseLinkEntityComposite<T> { protected AbstractOrmEclipseLinkEntity2_xComposite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends T> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -37,17 +37,17 @@ public abstract class AbstractOrmEclipseLinkEntity2_xComposite @Override protected Control initializeGeneratorsSection(Composite container) { - return new Generation2_0Composite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new Generation2_0Composite(this, this.buildGeneratorContainerModel(), container).getControl(); } @Override protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } @Override protected Control initializeQueriesSection(Composite container) { - return new Queries2_0Composite(this, this.buildQueryContainerHolder(), container).getControl(); + return new Queries2_0Composite(this, this.buildQueryContainerModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java index 6a68266001..083905b38a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; @@ -29,11 +28,11 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractOrmEclipseLinkEntityComposite - extends AbstractOrmEntityComposite +public abstract class AbstractOrmEclipseLinkEntityComposite<T extends OrmEclipseLinkEntity> + extends AbstractOrmEntityComposite<T> { protected AbstractOrmEclipseLinkEntityComposite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends T> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -70,14 +69,14 @@ public abstract class AbstractOrmEclipseLinkEntityComposite } protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCachingComposite(this, buildCachingHolder(), container).getControl(); + return new OrmEclipseLinkCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<OrmEntity, EclipseLinkCaching> buildCachingHolder() { - return new PropertyAspectAdapter<OrmEntity, EclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapter<T, EclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapter<T, EclipseLinkCaching>(getSubjectHolder()) { @Override protected EclipseLinkCaching buildValue_() { - return ((OrmEclipseLinkEntity) this.subject).getCaching(); + return this.subject.getCaching(); } }; } @@ -102,10 +101,10 @@ public abstract class AbstractOrmEclipseLinkEntityComposite } private PropertyValueModel<OrmEclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<OrmEntity, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected OrmEclipseLinkConverterContainer buildValue_() { - return ((OrmEclipseLinkEntity) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java index 7b4a893feb..161c3c7eac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java @@ -13,12 +13,8 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; -import org.eclipse.jpt.jpa.core.context.MappedSuperclass; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite; @@ -41,12 +37,11 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; - -public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite - extends AbstractMappedSuperclassComposite<OrmMappedSuperclass> +public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite<T extends OrmEclipseLinkMappedSuperclass> + extends AbstractMappedSuperclassComposite<T> { protected AbstractOrmEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends T> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -72,11 +67,11 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); // Metadata complete widgets MetadataCompleteTriStateCheckBox metadataCompleteComposite = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container); @@ -103,23 +98,14 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite } protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCachingComposite(this, buildCachingHolder(), container).getControl(); - } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; + return new OrmEclipseLinkCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<OrmMappedSuperclass, EclipseLinkCaching> buildCachingHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, EclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapter<T, EclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapter<T, EclipseLinkCaching>(getSubjectHolder()) { @Override protected EclipseLinkCaching buildValue_() { - return ((OrmEclipseLinkMappedSuperclass) this.subject).getCaching(); + return this.subject.getCaching(); } }; } @@ -144,10 +130,10 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite } private PropertyValueModel<OrmEclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<OrmMappedSuperclass, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected OrmEclipseLinkConverterContainer buildValue_() { - return ((OrmEclipseLinkMappedSuperclass) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } @@ -187,14 +173,14 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite } protected Control initializeGeneratorsSection(Composite container) { - return new Generation2_0Composite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new Generation2_0Composite(this, this.buildGeneratorContainerModel(), container).getControl(); } - protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerHolder() { - return new PropertyAspectAdapter<MappedSuperclass, GeneratorContainer>(getSubjectHolder()) { + protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { + return new PropertyAspectAdapter<T, GeneratorContainer>(getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { - return ((EclipseLinkMappedSuperclass) this.subject).getGeneratorContainer(); + return this.subject.getGeneratorContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java index 903150bffa..9607f078f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_0Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_1Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_2Definition; @@ -59,7 +58,7 @@ public class EclipseLinkEntityMappings2_0DetailsProvider resourceType.equals(EclipseLinkOrmXml2_2Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java index b776b0b2ba..7cb5530893 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_3Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_4Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_5Definition; @@ -56,10 +55,10 @@ public class EclipseLinkEntityMappings2_3DetailsProvider protected boolean providesDetails(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXml2_3Definition.instance().getResourceType()) || resourceType.equals(EclipseLinkOrmXml2_4Definition.instance().getResourceType()) || - resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType()); + resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager2_3(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java index f849606af2..8ac078e562 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_1Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_2Definition; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition; @@ -59,7 +58,7 @@ public class EclipseLinkEntityMappingsDetailsProvider || resourceType.equals(EclipseLinkOrmXml1_2Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java index e08fe99dc6..ce6c31910b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java @@ -12,27 +12,25 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_1Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXml1_1UiDefinition @@ -59,7 +57,7 @@ public class EclipseLinkOrmXml1_1UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml1_1UiFactory(); } @@ -72,32 +70,21 @@ public class EclipseLinkOrmXml1_1UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo( - List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); - - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo( - List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); + + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java index a3419cf271..b05a230b85 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiFactory.java @@ -12,15 +12,22 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; @@ -29,19 +36,20 @@ public class EclipseLinkOrmXml1_1UiFactory { // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkIdMapping1_1Composite((PropertyValueModel<? extends EclipseLinkIdMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override - public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -49,73 +57,79 @@ public class EclipseLinkOrmXml1_1UiFactory return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkBasicMapping1_1Composite((PropertyValueModel<? extends EclipseLinkBasicMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkVersionMapping1_1Composite((PropertyValueModel<? extends EclipseLinkVersionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToOneMapping1_1Composite((PropertyValueModel<? extends EclipseLinkManyToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToManyMapping1_1Composite((PropertyValueModel<? extends EclipseLinkOneToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToOneMapping1_1Composite((PropertyValueModel<? extends EclipseLinkOneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToManyMapping1_1Composite((PropertyValueModel<? extends EclipseLinkManyToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override - public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEmbeddedMapping1_1Composite(mappingModel, enabledModel,parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEmbeddedMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java index 348eee902a..0afcba5d20 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java @@ -12,27 +12,25 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_2Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXml1_2UiDefinition @@ -59,7 +57,7 @@ public class EclipseLinkOrmXml1_2UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml1_1UiFactory(); } @@ -72,32 +70,21 @@ public class EclipseLinkOrmXml1_2UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo( - List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); - - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo( - List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java index d1d0000027..efafcdde22 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java @@ -12,29 +12,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_0Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLinkOrmXml2_0UiDefinition extends AbstractOrmXmlResourceUiDefinition @@ -60,7 +58,7 @@ public class EclipseLinkOrmXml2_0UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml2_0UiFactory(); } @@ -73,34 +71,23 @@ public class EclipseLinkOrmXml2_0UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo( - List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); - - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo( - List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java index 8e983cd41f..3534274648 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiFactory.java @@ -12,145 +12,169 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -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.OrmVersionMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0; +import org.eclipse.jpt.jpa.ui.jpa2.details.JpaUiFactory2_0; import org.eclipse.swt.widgets.Composite; public class EclipseLinkOrmXml2_0UiFactory extends AbstractEclipseLinkOrmXmlUiFactory - implements OrmXmlUiFactory2_0 + implements JpaUiFactory2_0 { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkMappedSuperclass2_0Composite((PropertyValueModel<OrmEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEntity2_0Composite((PropertyValueModel<OrmEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkIdMapping2_0Composite((PropertyValueModel<? extends EclipseLinkIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEmbeddedMapping2_0Composite((PropertyValueModel<? extends EmbeddedMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEmbeddedIdMapping2_0Composite((PropertyValueModel<? extends EmbeddedIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkBasicMapping1_1Composite((PropertyValueModel<? extends EclipseLinkBasicMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkVersionMapping1_1Composite((PropertyValueModel<? extends EclipseLinkVersionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToOneMapping2_0Composite((PropertyValueModel<? extends EclipseLinkManyToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToManyMapping2_0Composite((PropertyValueModel<? extends EclipseLinkOneToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkOneToOneMapping2_0Composite((PropertyValueModel<? extends EclipseLinkOneToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkManyToManyMapping2_0Composite((PropertyValueModel<? extends EclipseLinkManyToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, + @SuppressWarnings("unchecked") + public JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkElementCollectionMapping2_0Composite((PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java index 6220a67202..ea1c8fff1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java @@ -12,29 +12,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_1Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLinkOrmXml2_1UiDefinition extends AbstractOrmXmlResourceUiDefinition @@ -60,7 +58,7 @@ public class EclipseLinkOrmXml2_1UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml2_1UiFactory(); } @@ -73,30 +71,23 @@ public class EclipseLinkOrmXml2_1UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java index d84d3470ea..cb3d05fa8e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiFactory.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; @@ -22,25 +24,27 @@ public class EclipseLinkOrmXml2_1UiFactory { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkMappedSuperclass2_1Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkMappedSuperclass2_1Composite((PropertyValueModel<OrmEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, + public JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkElementCollectionMapping2_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkElementCollectionMapping2_1Composite((PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java index 63bdf294b1..4a82b8a7de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -11,22 +11,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_3Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLinkOrmXml2_3UiDefinition @@ -52,7 +57,7 @@ public class EclipseLinkOrmXml2_3UiDefinition } @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml2_3UiFactory(); } @@ -63,26 +68,26 @@ public class EclipseLinkOrmXml2_3UiDefinition @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - definitions.add(OrmEclipseLinkArrayMapping2_3UiDefinition.instance()); - definitions.add(OrmEclipseLinkStructureMapping2_3UiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(EclipseLinkArrayMapping2_3UiDefinition.instance()); + definitions.add(EclipseLinkStructureMapping2_3UiDefinition.instance()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java index 1448193272..7cef92d9de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiFactory.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; @@ -22,21 +24,23 @@ public class EclipseLinkOrmXml2_3UiFactory { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkMappedSuperclass2_3Composite((PropertyValueModel<OrmEclipseLinkMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEclipseLinkEntity2_3Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new OrmEclipseLinkEntity2_3Composite((PropertyValueModel<OrmEclipseLinkEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java index 336386ba9c..0bd380a010 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java @@ -11,22 +11,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_4Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLinkOrmXml2_4UiDefinition @@ -52,7 +57,7 @@ public class EclipseLinkOrmXml2_4UiDefinition } @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml2_3UiFactory(); } @@ -62,25 +67,25 @@ public class EclipseLinkOrmXml2_4UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - definitions.add(OrmEclipseLinkArrayMapping2_3UiDefinition.instance()); - definitions.add(OrmEclipseLinkStructureMapping2_3UiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(EclipseLinkArrayMapping2_3UiDefinition.instance()); + definitions.add(EclipseLinkStructureMapping2_3UiDefinition.instance()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java index 04d86cfc35..31de1e527a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java @@ -10,24 +10,28 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; - import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_5Definition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3UiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0UiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class EclipseLinkOrmXml2_5UiDefinition @@ -53,7 +57,7 @@ public class EclipseLinkOrmXml2_5UiDefinition } @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXml2_3UiFactory(); } @@ -63,25 +67,25 @@ public class EclipseLinkOrmXml2_5UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - definitions.add(OrmEclipseLinkArrayMapping2_3UiDefinition.instance()); - definitions.add(OrmEclipseLinkStructureMapping2_3UiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(EclipseLinkArrayMapping2_3UiDefinition.instance()); + definitions.add(EclipseLinkStructureMapping2_3UiDefinition.instance()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java index 8612f21bd7..eb07099b22 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java @@ -12,27 +12,25 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXmlUiDefinition @@ -59,7 +57,7 @@ public class EclipseLinkOrmXmlUiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new EclipseLinkOrmXmlUiFactory(); } @@ -72,32 +70,21 @@ public class EclipseLinkOrmXmlUiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo( - List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); - - definitions.add(OrmEclipseLinkBasicCollectionMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkBasicMapMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkVariableOneToOneMappingUiDefinition.instance()); - definitions.add(OrmEclipseLinkTransformationMappingUiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo( - List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(EclipseLinkBasicCollectionMappingUiDefinition.instance()); + definitions.add(EclipseLinkBasicMapMappingUiDefinition.instance()); + definitions.add(EclipseLinkVariableOneToOneMappingUiDefinition.instance()); + definitions.add(EclipseLinkTransformationMappingUiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java deleted file mode 100644 index 72c354e10b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkArrayMapping2_3UiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkArrayMapping2_3UiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkArrayMapping2_3Composite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkArrayMapping2_3UiDefinition - extends AbstractEclipseLinkArrayMapping2_3UiDefinition<ReadOnlyPersistentAttribute, EclipseLinkArrayMapping2_3> - implements OrmAttributeMappingUiDefinition<EclipseLinkArrayMapping2_3> -{ - // singleton - private static final OrmEclipseLinkArrayMapping2_3UiDefinition INSTANCE = - new OrmEclipseLinkArrayMapping2_3UiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkArrayMapping2_3> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkArrayMapping2_3UiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkArrayMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkArrayMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java deleted file mode 100644 index 41e67b83ff..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkBasicCollectionMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicCollectionMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkBasicCollectionMappingUiDefinition - extends AbstractEclipseLinkBasicCollectionMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkBasicCollectionMapping> - implements OrmAttributeMappingUiDefinition<EclipseLinkBasicCollectionMapping> -{ - // singleton - private static final OrmEclipseLinkBasicCollectionMappingUiDefinition INSTANCE = - new OrmEclipseLinkBasicCollectionMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkBasicCollectionMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkBasicCollectionMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java deleted file mode 100644 index 4c29d1e6c3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkBasicMapMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkBasicMapMappingUiDefinition - extends AbstractEclipseLinkBasicMapMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkBasicMapMapping> - implements OrmAttributeMappingUiDefinition<EclipseLinkBasicMapMapping> -{ - // singleton - private static final OrmEclipseLinkBasicMapMappingUiDefinition INSTANCE = - new OrmEclipseLinkBasicMapMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkBasicMapMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkBasicMapMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java index 1b29224d6d..abd49222ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapping1_1Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -32,10 +30,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkBasicMapping1_1Composite - extends EclipseLinkBasicMappingComposite<BasicMapping> + extends EclipseLinkBasicMappingComposite<EclipseLinkBasicMapping> { public OrmEclipseLinkBasicMapping1_1Composite( - PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -55,7 +53,7 @@ public class OrmEclipseLinkBasicMapping1_1Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -70,7 +68,7 @@ public class OrmEclipseLinkBasicMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -83,20 +81,11 @@ public class OrmEclipseLinkBasicMapping1_1Composite optionalCheckBox.getControl().setLayoutData(gridData); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<BasicMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java index ec590e0371..6b257f9ee6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -28,10 +28,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkBasicMappingComposite - extends EclipseLinkBasicMappingComposite<BasicMapping> + extends EclipseLinkBasicMappingComposite<EclipseLinkBasicMapping> { public OrmEclipseLinkBasicMappingComposite( - PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -44,7 +44,7 @@ public class OrmEclipseLinkBasicMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -68,7 +68,7 @@ public class OrmEclipseLinkBasicMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java index 902a1438e7..1c024efa05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -32,10 +30,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkElementCollectionMapping2_0Composite - extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0> + extends EclipseLinkElementCollectionMapping2_0Composite<EclipseLinkElementCollectionMapping2_0> { public OrmEclipseLinkElementCollectionMapping2_0Composite( - PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, + PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -61,27 +59,18 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); new FetchTypeComboViewer(this, container); // Collection table widgets - CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableHolder(), container); + CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; collectionTableComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java index 9985b33adc..d366925fbb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java @@ -13,8 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite; @@ -35,10 +33,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkElementCollectionMapping2_1Composite - extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0> + extends EclipseLinkElementCollectionMapping2_0Composite<EclipseLinkElementCollectionMapping2_0> { public OrmEclipseLinkElementCollectionMapping2_1Composite( - PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, + PropertyValueModel<? extends EclipseLinkElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -64,7 +62,7 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -72,10 +70,10 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Collection table widgets - CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableHolder(), container); + CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; collectionTableComposite.getControl().setLayoutData(gridData); @@ -83,20 +81,11 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchHolder() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkElementCollectionMapping2_0) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java index d1bc249acb..c8862aea8d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEmbeddable; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite; @@ -29,10 +28,10 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkEmbeddableComposite - extends AbstractOrmEmbeddableComposite + extends AbstractOrmEmbeddableComposite<OrmEclipseLinkEmbeddable> { public OrmEclipseLinkEmbeddableComposite( - PropertyValueModel<? extends OrmEmbeddable> embeddableModel, + PropertyValueModel<? extends OrmEclipseLinkEmbeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -66,10 +65,10 @@ public class OrmEclipseLinkEmbeddableComposite } private PropertyValueModel<OrmEclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<OrmEmbeddable, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<OrmEclipseLinkEmbeddable, OrmEclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected OrmEclipseLinkConverterContainer buildValue_() { - return ((OrmEclipseLinkEmbeddable) this.subject).getConverterContainer(); + return this.subject.getConverterContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java index 19d4ed19f2..7690c68c30 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping1_1Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -55,7 +53,7 @@ public class OrmEclipseLinkEmbeddedIdMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Overrides widgets EmbeddedMappingOverridesComposite overridesComposite = new EmbeddedMappingOverridesComposite( @@ -67,13 +65,4 @@ public class OrmEclipseLinkEmbeddedIdMapping1_1Composite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EmbeddedIdMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java index 2928f27005..0ca5cc1eae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedIdMapping2_0Composite.java @@ -12,9 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingOverridesComposite; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; @@ -26,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkEmbeddedIdMapping2_0Composite - extends OrmEclipseLinkEmbeddedIdMapping1_1Composite + extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping2_0> { public OrmEclipseLinkEmbeddedIdMapping2_0Composite( - PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, + PropertyValueModel<? extends EmbeddedIdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -52,7 +53,7 @@ public class OrmEclipseLinkEmbeddedIdMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Mapped by relationship widgets EmbeddedIdMapping2_0MappedByRelationshipPane mappedByRelationshipPane = new EmbeddedIdMapping2_0MappedByRelationshipPane(this, getSubjectHolder(), container); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java index 3b45ca3b1b..c7b07a94d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping1_1Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -53,7 +51,7 @@ public class OrmEclipseLinkEmbeddedMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Overrides widgets EmbeddedMappingOverridesComposite overridesComposite = new EmbeddedMappingOverridesComposite( @@ -65,13 +63,4 @@ public class OrmEclipseLinkEmbeddedMapping1_1Composite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EmbeddedMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java index 8279b032f4..0ed910d5ea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddedMapping2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite; @@ -28,10 +26,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkEmbeddedMapping2_0Composite - extends AbstractEmbeddedMappingComposite<EmbeddedMapping> + extends AbstractEmbeddedMappingComposite<EmbeddedMapping2_0> { public OrmEclipseLinkEmbeddedMapping2_0Composite( - PropertyValueModel<? extends EmbeddedMapping> mappingModel, + PropertyValueModel<? extends EmbeddedMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -53,7 +51,7 @@ public class OrmEclipseLinkEmbeddedMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Overrides widgets EmbeddedMapping2_0OverridesComposite overridesComposite = new EmbeddedMapping2_0OverridesComposite( @@ -66,13 +64,4 @@ public class OrmEclipseLinkEmbeddedMapping2_0Composite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EmbeddedMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java index 4eba113784..5f961e2394 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_0Composite.java @@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; import org.eclipse.swt.widgets.Composite; public class OrmEclipseLinkEntity2_0Composite - extends AbstractOrmEclipseLinkEntity2_xComposite + extends AbstractOrmEclipseLinkEntity2_xComposite<OrmEclipseLinkEntity> { public OrmEclipseLinkEntity2_0Composite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends OrmEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java index 2dc74dbf2c..40c016d386 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntity2_3Composite.java @@ -13,7 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMultitenancy2_3; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMultitenancyComposite; @@ -27,10 +26,10 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkEntity2_3Composite - extends AbstractOrmEclipseLinkEntity2_xComposite + extends AbstractOrmEclipseLinkEntity2_xComposite<OrmEclipseLinkEntity> { public OrmEclipseLinkEntity2_3Composite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends OrmEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -67,14 +66,14 @@ public class OrmEclipseLinkEntity2_3Composite } protected Control initializeMultitenancySection(Composite container) { - return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyHolder(), container).getControl(); + return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<OrmEntity, OrmEclipseLinkMultitenancy2_3> buildMultitenancyHolder() { - return new PropertyAspectAdapter<OrmEntity, OrmEclipseLinkMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapter<OrmEclipseLinkEntity, OrmEclipseLinkMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapter<OrmEclipseLinkEntity, OrmEclipseLinkMultitenancy2_3>(getSubjectHolder()) { @Override protected OrmEclipseLinkMultitenancy2_3 buildValue_() { - return ((OrmEclipseLinkEntity) this.subject).getMultitenancy(); + return this.subject.getMultitenancy(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java index 20b27daff1..9ec2d90dac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEntityComposite.java @@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkEntity; import org.eclipse.swt.widgets.Composite; public class OrmEclipseLinkEntityComposite - extends AbstractOrmEclipseLinkEntityComposite + extends AbstractOrmEclipseLinkEntityComposite<OrmEclipseLinkEntity> { public OrmEclipseLinkEntityComposite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends OrmEclipseLinkEntity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java index fe2b08f442..8d1640265f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping1_1Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkIdMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -29,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkIdMapping1_1Composite - extends EclipseLinkIdMappingComposite<IdMapping> + extends EclipseLinkIdMappingComposite<EclipseLinkIdMapping> { public OrmEclipseLinkIdMapping1_1Composite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -54,7 +52,7 @@ public class OrmEclipseLinkIdMapping1_1Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -69,23 +67,14 @@ public class OrmEclipseLinkIdMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<IdMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java index 87da6b5bab..f8879a16a4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMapping2_0Composite.java @@ -12,7 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkIdMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -28,10 +29,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkIdMapping2_0Composite - extends OrmEclipseLinkIdMapping1_1Composite + extends EclipseLinkIdMappingComposite<EclipseLinkIdMapping2_0> { public OrmEclipseLinkIdMapping2_0Composite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkIdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -39,6 +40,14 @@ public class OrmEclipseLinkIdMapping2_0Composite super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + + @Override + protected void initializeLayout(Composite container) { + initializeIdCollapsibleSection(container); + initializeTypeCollapsibleSection(container); + initializeConvertersCollapsibleSection(container); + initializeGenerationCollapsibleSection(container); + } @Override protected Control initializeIdSection(Composite container) { @@ -50,7 +59,7 @@ public class OrmEclipseLinkIdMapping2_0Composite mappedByRelationshipPane.getControl().setLayoutData(gridData); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -65,10 +74,10 @@ public class OrmEclipseLinkIdMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java index dc800a1aef..abe645ec32 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkIdMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkIdMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -25,10 +25,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkIdMappingComposite - extends EclipseLinkIdMappingComposite<IdMapping> + extends EclipseLinkIdMappingComposite<EclipseLinkIdMapping> { public OrmEclipseLinkIdMappingComposite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -41,7 +41,7 @@ public class OrmEclipseLinkIdMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -55,7 +55,7 @@ public class OrmEclipseLinkIdMappingComposite new OrmAttributeTypeClassChooser(this, getSubjectHolder(), container, attributeTypeHyperlink); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java index 04b6b52a36..963aeec6b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping1_1Composite.java @@ -12,13 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -30,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToManyMapping1_1Composite - extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping> + extends AbstractEclipseLinkManyToManyMappingComposite<EclipseLinkManyToManyMapping, Cascade> { public OrmEclipseLinkManyToManyMapping1_1Composite( - PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -59,7 +60,7 @@ public class OrmEclipseLinkManyToManyMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -67,10 +68,10 @@ public class OrmEclipseLinkManyToManyMapping1_1Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java index 5aac494765..e27134c349 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java @@ -12,9 +12,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -31,10 +32,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToManyMapping2_0Composite - extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping> + extends AbstractEclipseLinkManyToManyMappingComposite<EclipseLinkManyToManyMapping2_0, Cascade2_0> { public OrmEclipseLinkManyToManyMapping2_0Composite( - PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -68,7 +69,7 @@ public class OrmEclipseLinkManyToManyMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -76,10 +77,10 @@ public class OrmEclipseLinkManyToManyMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java index b7e290e825..759c4c0461 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToManyMappingComposite.java @@ -12,11 +12,12 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -28,10 +29,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToManyMappingComposite - extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping> + extends AbstractEclipseLinkManyToManyMappingComposite<EclipseLinkManyToManyMapping, Cascade> { public OrmEclipseLinkManyToManyMappingComposite( - PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -61,10 +62,10 @@ public class OrmEclipseLinkManyToManyMappingComposite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java index 3236cc2054..1a9eb76968 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping1_1Composite.java @@ -11,19 +11,17 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; @@ -34,10 +32,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToOneMapping1_1Composite - extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping> + extends AbstractEclipseLinkManyToOneMappingComposite<EclipseLinkManyToOneMapping, Cascade> { public OrmEclipseLinkManyToOneMapping1_1Composite( - PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -59,7 +57,7 @@ public class OrmEclipseLinkManyToOneMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -67,7 +65,7 @@ public class OrmEclipseLinkManyToOneMapping1_1Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -76,21 +74,11 @@ public class OrmEclipseLinkManyToOneMapping1_1Composite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ManyToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java index 884d490ac5..57480570aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java @@ -13,11 +13,10 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetchMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping2_0; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -36,10 +35,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToOneMapping2_0Composite - extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping, ManyToOneRelationship2_0> + extends AbstractManyToOneMapping2_0Composite<EclipseLinkManyToOneMapping2_0, ManyToOneRelationship2_0, Cascade2_0> { public OrmEclipseLinkManyToOneMapping2_0Composite( - PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,7 +61,7 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -70,7 +69,7 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -79,7 +78,7 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -87,20 +86,11 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ManyToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<ManyToOneMapping, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkJoinFetchMapping) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java index 84498b3ae9..122ed222b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java @@ -11,17 +11,15 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkManyToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkManyToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; @@ -32,10 +30,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkManyToOneMappingComposite - extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping> + extends AbstractEclipseLinkManyToOneMappingComposite<EclipseLinkManyToOneMapping, Cascade> { public OrmEclipseLinkManyToOneMappingComposite( - PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -61,7 +59,7 @@ public class OrmEclipseLinkManyToOneMappingComposite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -70,21 +68,11 @@ public class OrmEclipseLinkManyToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ManyToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java index 3849aad483..077a325fc0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_0Composite.java @@ -12,15 +12,15 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class OrmEclipseLinkMappedSuperclass2_0Composite - extends AbstractOrmEclipseLinkMappedSuperclassComposite + extends AbstractOrmEclipseLinkMappedSuperclassComposite<OrmEclipseLinkMappedSuperclass> { public OrmEclipseLinkMappedSuperclass2_0Composite( - PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends OrmEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -29,6 +29,6 @@ public class OrmEclipseLinkMappedSuperclass2_0Composite @Override protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java index c08f2b5f36..6c0a6b2ee5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.QueryContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite; @@ -27,10 +26,10 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkMappedSuperclass2_1Composite - extends AbstractOrmEclipseLinkMappedSuperclassComposite + extends AbstractOrmEclipseLinkMappedSuperclassComposite<OrmEclipseLinkMappedSuperclass> { public OrmEclipseLinkMappedSuperclass2_1Composite( - PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends OrmEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -49,7 +48,7 @@ public class OrmEclipseLinkMappedSuperclass2_1Composite @Override protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } protected void initializeQueriesCollapsibleSection(Composite container) { @@ -68,15 +67,15 @@ public class OrmEclipseLinkMappedSuperclass2_1Composite } protected Control initializeQueriesSection(Composite container) { - return new QueriesComposite(this, this.buildQueryContainerHolder(), container).getControl(); + return new QueriesComposite(this, this.buildQueryContainerModel(), container).getControl(); } - private PropertyValueModel<QueryContainer> buildQueryContainerHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, QueryContainer>( + private PropertyValueModel<QueryContainer> buildQueryContainerModel() { + return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, QueryContainer>( getSubjectHolder()) { @Override protected QueryContainer buildValue_() { - return ((OrmEclipseLinkMappedSuperclass) this.subject).getQueryContainer(); + return this.subject.getQueryContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java index c20b22e901..8d0db7eb19 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_3Composite.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.QueryContainer; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMultitenancy2_3; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMultitenancyComposite; @@ -30,10 +29,10 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkMappedSuperclass2_3Composite - extends AbstractOrmEclipseLinkMappedSuperclassComposite + extends AbstractOrmEclipseLinkMappedSuperclassComposite<OrmEclipseLinkMappedSuperclass> { public OrmEclipseLinkMappedSuperclass2_3Composite( - PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends OrmEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -53,7 +52,7 @@ public class OrmEclipseLinkMappedSuperclass2_3Composite @Override protected Control initializeCachingSection(Composite container) { - return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), container).getControl(); + return new OrmEclipseLinkCaching2_0Composite(this, this.buildCachingModel(), container).getControl(); } protected void initializeQueriesCollapsibleSection(Composite container) { @@ -72,15 +71,15 @@ public class OrmEclipseLinkMappedSuperclass2_3Composite } protected Control initializeQueriesSection(Composite container) { - return new QueriesComposite(this, this.buildQueryContainerHolder(), container).getControl(); + return new QueriesComposite(this, this.buildQueryContainerModel(), container).getControl(); } - private PropertyValueModel<QueryContainer> buildQueryContainerHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, QueryContainer>( + private PropertyValueModel<QueryContainer> buildQueryContainerModel() { + return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, QueryContainer>( getSubjectHolder()) { @Override protected QueryContainer buildValue_() { - return ((OrmEclipseLinkMappedSuperclass) this.subject).getQueryContainer(); + return this.subject.getQueryContainer(); } }; } @@ -101,14 +100,14 @@ public class OrmEclipseLinkMappedSuperclass2_3Composite } protected Control initializeMultitenancySection(Composite container) { - return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyHolder(), container).getControl(); + return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<OrmMappedSuperclass, OrmEclipseLinkMultitenancy2_3> buildMultitenancyHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, OrmEclipseLinkMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, OrmEclipseLinkMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, OrmEclipseLinkMultitenancy2_3>(getSubjectHolder()) { @Override protected OrmEclipseLinkMultitenancy2_3 buildValue_() { - return ((OrmEclipseLinkMappedSuperclass) this.subject).getMultitenancy(); + return this.subject.getMultitenancy(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java index 626b924fd2..21187311c3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclassComposite.java @@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; +import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass; import org.eclipse.swt.widgets.Composite; public class OrmEclipseLinkMappedSuperclassComposite - extends AbstractOrmEclipseLinkMappedSuperclassComposite + extends AbstractOrmEclipseLinkMappedSuperclassComposite<OrmEclipseLinkMappedSuperclass> { public OrmEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends OrmEclipseLinkMappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java index a046539648..57d4678cc4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping1_1Composite.java @@ -11,17 +11,16 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -33,10 +32,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToManyMapping1_1Composite - extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> + extends AbstractEclipseLinkOneToManyMappingComposite<EclipseLinkOneToManyMapping, Cascade> { public OrmEclipseLinkOneToManyMapping1_1Composite( - PropertyValueModel<? extends OneToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,7 +61,7 @@ public class OrmEclipseLinkOneToManyMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -70,29 +69,20 @@ public class OrmEclipseLinkOneToManyMapping1_1Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToManyMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java index 21e3f5614c..cf39d0b226 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java @@ -13,12 +13,11 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_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.eclipselink.core.context.EclipseLinkOneToManyMapping2_0; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; @@ -37,10 +36,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToManyMapping2_0Composite - extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> + extends AbstractEclipseLinkOneToManyMappingComposite<EclipseLinkOneToManyMapping2_0, Cascade2_0> { public OrmEclipseLinkOneToManyMapping2_0Composite( - PropertyValueModel<? extends OneToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -75,7 +74,7 @@ public class OrmEclipseLinkOneToManyMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -83,22 +82,22 @@ public class OrmEclipseLinkOneToManyMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, this.buildJoinFetchModel(), container); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableHolder(), container); + OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; orphanRemovalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -110,21 +109,12 @@ public class OrmEclipseLinkOneToManyMapping2_0Composite protected Control initializeOrderingSection(Composite container) { return new Ordering2_0Composite(this, container).getControl(); } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToManyMapping, AccessHolder>(this.getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<OneToManyMapping, OrphanRemovable2_0>(this.getSubjectHolder()) { + protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { + return new PropertyAspectAdapter<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getOrphanRemoval(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java index d5db154585..3878b3af5a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java @@ -11,15 +11,14 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -32,10 +31,10 @@ import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToManyMappingComposite - extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> + extends AbstractEclipseLinkOneToManyMappingComposite<EclipseLinkOneToManyMapping, Cascade> { public OrmEclipseLinkOneToManyMappingComposite( - PropertyValueModel<? extends OneToManyMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -65,29 +64,20 @@ public class OrmEclipseLinkOneToManyMappingComposite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToManyMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java index 55a560f51f..69d553ba3e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping1_1Composite.java @@ -11,21 +11,18 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.MappedByPane; -import org.eclipse.jpt.jpa.ui.internal.details.OneToOneJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; @@ -36,10 +33,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToOneMapping1_1Composite - extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> + extends AbstractEclipseLinkOneToOneMappingComposite<EclipseLinkOneToOneMapping, Cascade> { public OrmEclipseLinkOneToOneMapping1_1Composite( - PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -61,7 +58,7 @@ public class OrmEclipseLinkOneToOneMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -69,7 +66,7 @@ public class OrmEclipseLinkOneToOneMapping1_1Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -78,26 +75,17 @@ public class OrmEclipseLinkOneToOneMapping1_1Composite optionalCheckBox.getControl().setLayoutData(gridData); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java index 697d350b47..cde9268b94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java @@ -13,13 +13,10 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_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.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; @@ -42,10 +39,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToOneMapping2_0Composite - extends AbstractOneToOneMapping2_0Composite<OneToOneMapping, OneToOneRelationship2_0> + extends AbstractOneToOneMapping2_0Composite<EclipseLinkOneToOneMapping2_0, OneToOneRelationship2_0, Cascade2_0> { public OrmEclipseLinkOneToOneMapping2_0Composite( - PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -68,7 +65,7 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -76,7 +73,7 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -85,19 +82,19 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableHolder(), container); + OrphanRemoval2_0TriStateCheckBox orphanRemovalCheckBox = new OrphanRemoval2_0TriStateCheckBox(this, buildOrphanRemovableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; orphanRemovalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -107,41 +104,23 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; + new OneToOneJoiningStrategy2_0Pane(this, buildRelationshipModel(), container); } - protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<OneToOneMapping, EclipseLinkJoinFetch>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { + return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { - return ((EclipseLinkOneToOneMapping) this.subject).getJoinFetch(); + return this.subject.getJoinFetch(); } }; } - protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { - return new PropertyAspectAdapter<OneToOneMapping, EclipseLinkPrivateOwned>(getSubjectHolder()) { + protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { + return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { - return ((EclipseLinkOneToOneMapping) this.subject).getPrivateOwned(); - } - }; - } - - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<OneToOneMapping, OrphanRemovable2_0>(getSubjectHolder()) { - @Override - protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getPrivateOwned(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java index f43a61cd16..8ed20015da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java @@ -11,19 +11,16 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.orm.OrmCascade; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToOneMapping; +import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkOneToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToOneMappingComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.MappedByPane; -import org.eclipse.jpt.jpa.ui.internal.details.OneToOneJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; @@ -34,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkOneToOneMappingComposite - extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> + extends AbstractEclipseLinkOneToOneMappingComposite<EclipseLinkOneToOneMapping, OrmCascade> { public OrmEclipseLinkOneToOneMappingComposite( - PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -63,7 +60,7 @@ public class OrmEclipseLinkOneToOneMappingComposite // Join fetch widgets this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkJoinFetchComposite_label); - new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchableHolder(), container); + new EclipseLinkJoinFetchComboViewer(this, buildJoinFetchModel(), container); // Optional widgets OptionalTriStateCheckBox optionalCheckBox = new OptionalTriStateCheckBox(this, container); @@ -72,26 +69,17 @@ public class OrmEclipseLinkOneToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Private owned widgets - EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnableHolder(), container); + EclipseLinkPrivateOwnedCheckBox privateOwnedCheckBox = new EclipseLinkPrivateOwnedCheckBox(this, buildPrivateOwnedModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; privateOwnedCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java deleted file mode 100644 index 6ca35e2d19..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkStructureMapping2_3UiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2_3; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkStructureMapping2_3UiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureMapping2_3Composite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkStructureMapping2_3UiDefinition - extends AbstractEclipseLinkStructureMapping2_3UiDefinition<ReadOnlyPersistentAttribute, EclipseLinkStructureMapping2_3> - implements OrmAttributeMappingUiDefinition<EclipseLinkStructureMapping2_3> -{ - // singleton - private static final OrmEclipseLinkStructureMapping2_3UiDefinition INSTANCE = - new OrmEclipseLinkStructureMapping2_3UiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkStructureMapping2_3> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkStructureMapping2_3UiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkStructureMapping2_3> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkStructureMapping2_3Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java deleted file mode 100644 index 3cefcea512..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkTransformationMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkTransformationMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkTransformationMappingUiDefinition - extends AbstractEclipseLinkTransformationMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkTransformationMapping> - implements OrmAttributeMappingUiDefinition<EclipseLinkTransformationMapping> -{ - // singleton - private static final OrmEclipseLinkTransformationMappingUiDefinition INSTANCE = - new OrmEclipseLinkTransformationMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkTransformationMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkTransformationMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java deleted file mode 100644 index 563eb33f11..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVariableOneToOneMappingUiDefinition.java +++ /dev/null @@ -1,51 +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.eclipselink.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneMapping; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.AbstractEclipseLinkVariableOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public class OrmEclipseLinkVariableOneToOneMappingUiDefinition - extends AbstractEclipseLinkVariableOneToOneMappingUiDefinition<ReadOnlyPersistentAttribute, EclipseLinkVariableOneToOneMapping> - implements OrmAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> -{ - // singleton - private static final OrmEclipseLinkVariableOneToOneMappingUiDefinition INSTANCE = - new OrmEclipseLinkVariableOneToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<EclipseLinkVariableOneToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEclipseLinkVariableOneToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java index 3152a8bcb3..e663c70ee9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMapping1_1Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVersionMappingComposite; @@ -29,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkVersionMapping1_1Composite - extends EclipseLinkVersionMappingComposite<VersionMapping> + extends EclipseLinkVersionMappingComposite<EclipseLinkVersionMapping> { public OrmEclipseLinkVersionMapping1_1Composite( - PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -52,7 +50,7 @@ public class OrmEclipseLinkVersionMapping1_1Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -67,23 +65,14 @@ public class OrmEclipseLinkVersionMapping1_1Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<VersionMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java index 8ded1ffa43..68733ef72e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkVersionMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVersionMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMutableTriStateCheckBox; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVersionMappingComposite; @@ -25,10 +25,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkVersionMappingComposite - extends EclipseLinkVersionMappingComposite<VersionMapping> + extends EclipseLinkVersionMappingComposite<EclipseLinkVersionMapping> { public OrmEclipseLinkVersionMappingComposite( - PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<? extends EclipseLinkVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -41,7 +41,7 @@ public class OrmEclipseLinkVersionMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -55,7 +55,7 @@ public class OrmEclipseLinkVersionMappingComposite new OrmAttributeTypeClassChooser(this, getSubjectHolder(), container, attributeTypeHyperlink); // Mutable widgets - EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableHolder(), container); + EclipseLinkMutableTriStateCheckBox mutableCheckBox = new EclipseLinkMutableTriStateCheckBox(this, buildMutableModel(), container); gridData = new GridData(); gridData.horizontalSpan = 2; mutableCheckBox.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java index 3ffec1cd62..531ed77ed5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/dialogs/AddVirtualAttributeDialog.java @@ -107,7 +107,7 @@ public class AddVirtualAttributeDialog extends StatusDialog { new LabelProvider() { @Override public String getText(Object element) { - return ((MappingUiDefinition<?,?>) element).getLabel(); + return ((MappingUiDefinition) element).getLabel(); } }); this.mappingCombo.addSelectionChangedListener(new ISelectionChangedListener() { @@ -226,9 +226,9 @@ public class AddVirtualAttributeDialog extends StatusDialog { return (OrmXmlDefinition) this.getJpaProject().getJpaPlatform().getResourceDefinition(this.getJptResourceType()); } - protected Comparator<MappingUiDefinition<?,?>> getProvidersComparator() { - return new Comparator<MappingUiDefinition<?,?>>() { - public int compare(MappingUiDefinition<?,?> item1, MappingUiDefinition<?,?> item2) { + protected Comparator<MappingUiDefinition> getProvidersComparator() { + return new Comparator<MappingUiDefinition>() { + public int compare(MappingUiDefinition item1, MappingUiDefinition item2) { String displayString1 = item1.getLabel(); String displayString2 = item2.getLabel(); return Collator.getInstance().compare(displayString1, displayString2); @@ -317,7 +317,7 @@ public class AddVirtualAttributeDialog extends StatusDialog { public String getMappingKey() { StructuredSelection selection = (StructuredSelection) this.mappingCombo.getSelection(); - return (selection.isEmpty()) ? null : ((MappingUiDefinition<?,?>) selection.getFirstElement()).getKey(); + return (selection.isEmpty()) ? null : ((MappingUiDefinition) selection.getFirstElement()).getKey(); } public String getTargetType() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityField.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityField.java index bb6a2995c5..1812d5725a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityField.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/entity/data/model/DynamicEntityField.java @@ -21,7 +21,7 @@ public class DynamicEntityField { private static final char BRACKET_SQUARE = '['; private static final char BRACKET_ANGULAR = '<'; private static final String PACKAGE_JAVA_LANG = "java.lang."; //$NON-NLS-1$ - private MappingUiDefinition<?,?> mappingType; + private MappingUiDefinition mappingType; private String name = ""; //$NON-NLS-1$ private String attributeType; private String fqnAttributeType; @@ -43,7 +43,7 @@ public class DynamicEntityField { /** * @return the mapping type of the dynamic entity field */ - public MappingUiDefinition<?,?> getMappingType() { + public MappingUiDefinition getMappingType() { return this.mappingType; } @@ -52,7 +52,7 @@ public class DynamicEntityField { * * @param mappingType */ - public void setMappingType(MappingUiDefinition<?,?> mappingType) { + public void setMappingType(MappingUiDefinition mappingType) { this.mappingType = mappingType; } @@ -60,7 +60,7 @@ public class DynamicEntityField { * @return the name of the dynamic entity field */ public String getName() { - return name; + return this.name; } /** @@ -75,7 +75,7 @@ public class DynamicEntityField { * @return the attribute type (as a simple name) of the dynamic entity field */ public String getAttributeType() { - return attributeType; + return this.attributeType; } /** @@ -91,7 +91,7 @@ public class DynamicEntityField { * @return the target type (as a simple name) of the dynamic entity field */ public String getTargetType() { - return targetType; + return this.targetType; } /** @@ -107,7 +107,7 @@ public class DynamicEntityField { * @return the attribute type (as fully qualified name) of the dynamic entity field */ public String getFqnAttributeType() { - return fqnAttributeType; + return this.fqnAttributeType; } /** @@ -136,7 +136,7 @@ public class DynamicEntityField { * @return the target type (as fully qualified name) of the dynamic entity field */ public String getFqnTargetType() { - return fqnTargetType; + return this.fqnTargetType; } /** @@ -202,7 +202,7 @@ public class DynamicEntityField { * or part of composite primary key */ public boolean isKey() { - return key; + return this.key; } /** @@ -229,11 +229,11 @@ public class DynamicEntityField { final int prime = 31; int result = 1; result = prime * result - + ((fqnAttributeType == null) ? 0 : fqnAttributeType.hashCode()); - result = prime * result + ((name == null) ? 0 : name.hashCode()); - result = prime* result + (mappingType == null? 0 : mappingType.hashCode()); + + ((this.fqnAttributeType == null) ? 0 : this.fqnAttributeType.hashCode()); + result = prime * result + ((this.name == null) ? 0 : this.name.hashCode()); + result = prime* result + (this.mappingType == null? 0 : this.mappingType.hashCode()); result = prime * result - + ((fqnTargetType == null) ? 0 : fqnTargetType.hashCode()); + + ((this.fqnTargetType == null) ? 0 : this.fqnTargetType.hashCode()); return result; } @@ -252,25 +252,25 @@ public class DynamicEntityField { if (getClass() != obj.getClass()) return false; final DynamicEntityField other = (DynamicEntityField) obj; - if (fqnAttributeType == null) { + if (this.fqnAttributeType == null) { if (other.fqnAttributeType != null) return false; - } else if (!fqnAttributeType.equals(other.fqnAttributeType)) + } else if (!this.fqnAttributeType.equals(other.fqnAttributeType)) return false; - if (name == null) { + if (this.name == null) { if (other.name != null) return false; - } else if (!name.equals(other.name)) + } else if (!this.name.equals(other.name)) return false; - if (mappingType == null) { + if (this.mappingType == null) { if (other.mappingType != null) return false; - } else if (!mappingType.equals(other.mappingType)) + } else if (!this.mappingType.equals(other.mappingType)) return false; - if (fqnTargetType == null) { + if (this.fqnTargetType == null) { if (other.fqnTargetType != null) return false; - } else if (!fqnTargetType.equals(other.fqnTargetType)) + } else if (!this.fqnTargetType.equals(other.fqnTargetType)) return false; return true; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java index f7e6dcd32b..b3321940c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/DynamicEntityFieldTableSection.java @@ -488,9 +488,9 @@ public class DynamicEntityFieldTableSection extends Composite { close(); } - private MappingUiDefinition<?,?> getMappingUiDefinition(ComboViewer mappingType) { + private MappingUiDefinition getMappingUiDefinition(ComboViewer mappingType) { StructuredSelection selection = (StructuredSelection) mappingType.getSelection(); - return (selection.isEmpty()) ? null : (MappingUiDefinition<?,?>) selection.getFirstElement(); + return (selection.isEmpty()) ? null : (MappingUiDefinition) selection.getFirstElement(); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF index 4e577f4217..d39b8bcc5b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF @@ -50,8 +50,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", Import-Package: com.ibm.icu.text;version="4.0.1" Export-Package: org.eclipse.jpt.jpa.ui, org.eclipse.jpt.jpa.ui.details, - org.eclipse.jpt.jpa.ui.details.java, - org.eclipse.jpt.jpa.ui.details.orm, org.eclipse.jpt.jpa.ui.editors, org.eclipse.jpt.jpa.ui.internal;x-internal:=true, org.eclipse.jpt.jpa.ui.internal.actions;x-internal:=true, @@ -92,6 +90,5 @@ Export-Package: org.eclipse.jpt.jpa.ui, org.eclipse.jpt.jpa.ui.internal.wizards.orm;x-internal:=true, org.eclipse.jpt.jpa.ui.internal.wizards.proj;x-internal:=true, org.eclipse.jpt.jpa.ui.internal.wizards.proj.model;x-internal:=true, - org.eclipse.jpt.jpa.ui.jpa2.details.java, - org.eclipse.jpt.jpa.ui.jpa2.details.orm, + org.eclipse.jpt.jpa.ui.jpa2.details, org.eclipse.jpt.jpa.ui.selection diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java index 92d30711e8..241f5134a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java @@ -74,7 +74,7 @@ public interface JpaPlatformUi { // ********** details page managers ********** - JpaDetailsPageManager<? extends JpaStructureNode> buildJpaDetailsPageManager( + JpaDetailsPageManager buildJpaDetailsPageManager( Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory, @@ -94,16 +94,19 @@ public interface JpaPlatformUi { JpaComposite buildTypeMappingComposite( JptResourceType resourceType, String mappingKey, - Composite parent, - PropertyValueModel<TypeMapping> mappingHolder, + PropertyValueModel<TypeMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions(JptResourceType resourceType); + Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(PersistentType persistentType); + + Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(JptResourceType resourceType); - MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(JptResourceType resourceType, String mappingKey); + MappingUiDefinition getTypeMappingUiDefinition(JptResourceType resourceType, String mappingKey); - DefaultMappingUiDefinition<PersistentType, ? extends TypeMapping> getDefaultTypeMappingUiDefinition(JptResourceType resourceType); + DefaultMappingUiDefinition getDefaultTypeMappingUiDefinition(JptResourceType resourceType); // ********** attribute mappings ********** @@ -111,17 +114,19 @@ public interface JpaPlatformUi { JpaComposite buildAttributeMappingComposite( JptResourceType resourceType, String mappingKey, - Composite parent, + Composite parentComposite, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, WidgetFactory widgetFactory, ResourceManager resourceManager); - Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions(JptResourceType resourceType); + Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions(ReadOnlyPersistentAttribute persistentAttribute); + + Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions(JptResourceType resourceType); - MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey); + MappingUiDefinition getAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey); - DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey); + DefaultMappingUiDefinition getDefaultAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey); // ********** metadata conversion ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java index 81f42ee626..0ae8a90b06 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/MappingResourceUiDefinition.java @@ -13,8 +13,6 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; @@ -42,6 +40,7 @@ public interface MappingResourceUiDefinition JpaComposite buildTypeMappingComposite( String mappingKey, PropertyValueModel<TypeMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager @@ -50,18 +49,18 @@ public interface MappingResourceUiDefinition /** * Return the resource's type mapping UI definitions. */ - Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions(); + Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(); /** * Return the resource's type mapping UI definition for the specified * mapping. */ - MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(String mappingKey); + MappingUiDefinition getTypeMappingUiDefinition(String mappingKey); /** * Return the resource's default type mapping UI definition. */ - DefaultMappingUiDefinition<PersistentType, ? extends TypeMapping> getDefaultTypeMappingUiDefinition(); + DefaultMappingUiDefinition getDefaultTypeMappingUiDefinition(); // ********** attribute mappings ********** @@ -81,17 +80,17 @@ public interface MappingResourceUiDefinition /** * Return the resource's attribute mapping UI definitions. */ - Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions(); + Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions(); /** * Return the resource's attribute mapping UI definition for the specified * mapping. */ - MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(String mappingKey); + MappingUiDefinition getAttributeMappingUiDefinition(String mappingKey); /** * Return the resource's default attribute mapping UI definition * for the specified mapping. */ - DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(String mappingKey); + DefaultMappingUiDefinition getDefaultAttributeMappingUiDefinition(String mappingKey); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java index cfd2e54a12..0927e3fe2c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/DefaultMappingUiDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2009 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. @@ -16,8 +16,8 @@ package org.eclipse.jpt.jpa.ui.details; * pioneering adopters on the understanding that any code that uses this API * will almost certainly be broken (repeatedly) as the API evolves. */ -public interface DefaultMappingUiDefinition<M, T> - extends MappingUiDefinition<M, T> +public interface DefaultMappingUiDefinition + extends MappingUiDefinition { /** * Return a key corresponding to the key to be used when the mapping's diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java index 43f43d517b..c40e8dea33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsPageManager.java @@ -24,14 +24,13 @@ import org.eclipse.swt.widgets.Control; * 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. - * - * @param <T> the type of the details page manager's model + * * @version 3.3 * @since 2.0 * @see JpaDetailsProvider */ -public interface JpaDetailsPageManager<T extends JpaStructureNode> { +public interface JpaDetailsPageManager { /** * Return the details page manager's page. */ @@ -40,15 +39,14 @@ public interface JpaDetailsPageManager<T extends JpaStructureNode> { /** * Return the details page manager's subject. */ - T getSubject(); + JpaStructureNode getSubject(); /** * Set the details page manager's subject. - * The subject must be of type <code>T</code>. */ - void setSubject(Object subject); + void setSubject(JpaStructureNode subject); interface Factory { - <T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager); + JpaDetailsPageManager buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java index 31da38d7a8..5aee57d285 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite; * 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 * * @see JpaDetailsPageManager @@ -41,7 +41,7 @@ public interface JpaDetailsProvider { * factory, and resource manager. */ // TODO pass in JpaUiFactory so these pages can be built using the factory and overridden? - JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager( + JpaDetailsPageManager buildDetailsPageManager( Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaUiFactory.java index db547819ae..67860be01a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmXmlUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaUiFactory.java @@ -3,62 +3,62 @@ * 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.ui.details.orm; +package org.eclipse.jpt.jpa.ui.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -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.OrmTransientMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.TransientMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.swt.widgets.Composite; /** - * Use an <code>orm.xml</code> UI factory to create any <code>orm.xml</code> - * JPA composites. + * Use {@link JpaUiFactory} to create any JPA composites for use in the JPA Details view * <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.0 - * @since 1.0 + * + * + * @version 3.3 + * @since 3.3 */ -public interface OrmXmlUiFactory { +public interface JpaUiFactory +{ // ********** type mappings ********** - JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmEmbeddableComposite( - PropertyValueModel<OrmEmbeddable> embeddableModel, + JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); @@ -66,73 +66,73 @@ public interface OrmXmlUiFactory { // ********** attribute mappings ********** - JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, + JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> mappingModel, + JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); - JpaComposite createOrmTransientMappingComposite( - PropertyValueModel<OrmTransientMapping> mappingModel, + JpaComposite createTransientMappingComposite( + PropertyValueModel<? extends TransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager); -} +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java index e94112b4d5..7549c56d41 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/MappingUiDefinition.java @@ -10,8 +10,14 @@ package org.eclipse.jpt.jpa.ui.details; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.transformer.Transformer; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.swt.widgets.Composite; /** * A mapping UI definition provides the {@link #getLabel() label} and @@ -24,10 +30,10 @@ import org.eclipse.jpt.common.utility.transformer.Transformer; * 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 MappingUiDefinition<M, T> { +public interface MappingUiDefinition { /** * Return a key corresponding to the mapping's key. @@ -61,6 +67,19 @@ public interface MappingUiDefinition<M, T> { String getLinkLabel(); /** + * Create a JPA composite corresponding to the definition's mapping type. + * This will be displayed by the JPA details view + * when the mapping key matches the definition's key. + */ + JpaComposite buildMappingComposite( + JpaUiFactory factory, + PropertyValueModel<? extends JpaContextNode> nodeModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager); + + /** * Return an image descriptor corresponding to the mapping type. */ ImageDescriptor getImageDescriptor(); @@ -76,12 +95,25 @@ public interface MappingUiDefinition<M, T> { } /** - * Return whether the mapping type represented by this definition is enabled for the given - * mappable object. This is almost always true. + * Return whether the ui represented by this definition is enabled for the given + * node. This is almost always true. */ - // TODO bjv remove this; either - // - delegate to whatever controls the list of UI definitions so it can be overridden by EclipseLink - // or - // - delegate to the model definitions (if we think there are more extends that need this...) - boolean isEnabledFor(M mappableObject); + boolean isEnabledFor(JpaContextNode node); + + + // ********** null composite ********** + + static class NullComposite + extends Pane<JpaContextNode> + implements JpaComposite + { + public NullComposite(PropertyValueModel<? extends JpaContextNode> mappingModel, Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + super(mappingModel, parent, widgetFactory, resourceManager); + } + + @Override + protected void initializeLayout(Composite container) { + // NOP + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java deleted file mode 100644 index b7510a4d6b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaAttributeMappingUiDefinition.java +++ /dev/null @@ -1,43 +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.ui.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -/** - * 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 JavaAttributeMappingUiDefinition<M extends AttributeMapping> - extends MappingUiDefinition<ReadOnlyPersistentAttribute, M> -{ - /** - * Create a JPA composite corresponding to the definition's mapping type. - * This will be displayed by the JPA details view - * when the mapping key matches the definition's key. - */ - JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<M> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java deleted file mode 100644 index 34c1c17616..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaTypeMappingUiDefinition.java +++ /dev/null @@ -1,42 +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.ui.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -/** - * 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 JavaTypeMappingUiDefinition<M extends TypeMapping> - extends MappingUiDefinition<PersistentType, M> -{ - /** - * Create a JPA composite corresponding to the definition's mapping type. - * This will be displayed by the JPA details view - * when the mapping key matches the definition's key. - */ - JpaComposite buildTypeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<M> mappingModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java deleted file mode 100644 index e427956b7e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/java/JavaUiFactory.java +++ /dev/null @@ -1,137 +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.ui.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -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.JavaTransientMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.swt.widgets.Composite; - -/** - * Use a Java UI factory to create any Java JPA composites. - * <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.0 - * @since 3.0 - */ -public interface JavaUiFactory { - - // ********** type mappings ********** - - JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - - // ********** attribute mappings ********** - - JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaEmbeddedIdMappingComposite( - PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaBasicMappingComposite( - PropertyValueModel<JavaBasicMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaVersionMappingComposite( - PropertyValueModel<JavaVersionMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaEmbeddedMappingComposite( - PropertyValueModel<JavaEmbeddedMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); - - JpaComposite createJavaTransientMappingComposite( - PropertyValueModel<JavaTransientMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java deleted file mode 100644 index 048fbd2d6e..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmAttributeMappingUiDefinition.java +++ /dev/null @@ -1,43 +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.ui.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -/** - * 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 OrmAttributeMappingUiDefinition<M extends AttributeMapping> - extends MappingUiDefinition<ReadOnlyPersistentAttribute, M> -{ - /** - * Create a JPA composite corresponding to the definition's mapping type. - * This will be displayed by the JPA details view - * when the mapping key matches the definition's key. - */ - JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<M> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java deleted file mode 100644 index 6e05dd9cab..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/orm/OrmTypeMappingUiDefinition.java +++ /dev/null @@ -1,42 +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.ui.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -/** - * 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 OrmTypeMappingUiDefinition<M extends TypeMapping> - extends MappingUiDefinition<PersistentType, M> -{ - /** - * Create a JPA composite corresponding to the definition's mapping type. - * This will be displayed by the JPA details view - * when the mapping key matches the definition's key. - */ - JpaComposite buildTypeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<M> mappingModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java index c7e67c726b..0337315944 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java @@ -61,9 +61,8 @@ public class JpaStructureNodeAdapterFactory this.jpaStructureNode = jpaStructureNode; } - @SuppressWarnings("unchecked") - public <T extends JpaStructureNode> JpaDetailsPageManager<T> buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return (JpaDetailsPageManager<T>) this.getJpaPlatformUi().buildJpaDetailsPageManager(parent, this.jpaStructureNode, widgetFactory, resourceManager); + public JpaDetailsPageManager buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return this.getJpaPlatformUi().buildJpaDetailsPageManager(parent, this.jpaStructureNode, widgetFactory, resourceManager); } private JpaPlatformUi getJpaPlatformUi() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java index 24d817e71c..d0e388fac4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java @@ -16,6 +16,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.BasicMapping; @@ -101,7 +102,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping> protected Control initializeBasicSection(Composite container) { container = this.addSubPane(container, 2, 0, 0, 0, 0); - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -170,7 +171,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping> return container; } - protected PropertyValueModel<Column> buildColumnHolder() { + protected PropertyValueModel<Column> buildColumnModel() { return new TransformationPropertyValueModel<T, Column>(getSubjectHolder()) { @Override protected Column transform_(T mapping) { @@ -207,7 +208,7 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping> } protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); @@ -222,4 +223,13 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping> } }; } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java index f8bd417556..5e18baed01 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingUiDefinition.java @@ -10,31 +10,30 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.swt.widgets.Composite; -public abstract class AbstractBasicMappingUiDefinition<M, T extends BasicMapping> - extends AbstractMappingUiDefinition<M, T> +public abstract class AbstractBasicMappingUiDefinition + extends AbstractMappingUiDefinition { protected AbstractBasicMappingUiDefinition() { super(); } - public String getKey() { - return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.BasicMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.BasicMappingUiProvider_linkLabel; - } - @Override public ImageDescriptor getImageDescriptor() { return JptJpaUiImages.BASIC; } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createBasicMappingComposite((PropertyValueModel<BasicMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java index 35b118b207..084141c2a4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -36,12 +35,12 @@ import org.eclipse.swt.widgets.Composite; * @see OneToManyMappingComposite * @see OneToOneMappingComposite */ -public class CascadeComposite - extends Pane<Cascade> +public abstract class AbstractCascadePane<T extends Cascade> + extends Pane<T> { - public CascadeComposite( + protected AbstractCascadePane( Pane<? extends RelationshipMapping> parentPane, - PropertyValueModel<? extends Cascade> cascadeModel, + PropertyValueModel<? extends T> cascadeModel, Composite parent ) { super(parentPane, cascadeModel, parent); @@ -55,7 +54,7 @@ public class CascadeComposite 5, null); } - + @Override protected void initializeLayout(Composite container) { addAllCheckBox(container); @@ -64,118 +63,113 @@ public class CascadeComposite addRemoveCheckBox(container); addRefreshCheckBox(container); } - + protected void addAllCheckBox(Composite container) { - // All check box addCheckBox( container, JptUiDetailsMessages.CascadeComposite_all, - buildCascadeTypeAllHolder(), + buildCascadeTypeAllModel(), null); } - + protected void addPersistCheckBox(Composite container) { - // Persist check box addCheckBox( container, JptUiDetailsMessages.CascadeComposite_persist, - buildCascadeTypePersistHolder(), + buildCascadeTypePersistModel(), null); } - + protected void addMergeCheckBox(Composite container) { - // Merge check box addCheckBox( container, JptUiDetailsMessages.CascadeComposite_merge, - buildCascadeTypeMergeHolder(), + buildCascadeTypeMergeModel(), null); } - + protected void addRemoveCheckBox(Composite container) { - // Remove check box addCheckBox( container, JptUiDetailsMessages.CascadeComposite_remove, - buildCascadeTypeRemoveHolder(), + buildCascadeTypeRemoveModel(), null); } protected void addRefreshCheckBox(Composite container) { - // Refresh check box addCheckBox( container, JptUiDetailsMessages.CascadeComposite_refresh, - buildCascadeTypeRefreshHolder(), + buildCascadeTypeRefreshModel(), null); } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeAllHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeAllModel() { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { @Override protected Boolean buildValue_() { - return subject.isAll(); + return Boolean.valueOf(this.subject.isAll()); } @Override protected void setValue_(Boolean value) { - subject.setAll(value); + this.subject.setAll(value.booleanValue()); } }; } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeMergeHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeMergeModel() { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { @Override protected Boolean buildValue_() { - return subject.isMerge(); + return Boolean.valueOf(this.subject.isMerge()); } @Override protected void setValue_(Boolean value) { - subject.setMerge(value); + this.subject.setMerge(value.booleanValue()); } }; } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypePersistHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypePersistModel() { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { @Override protected Boolean buildValue_() { - return subject.isPersist(); + return Boolean.valueOf(this.subject.isPersist()); } @Override protected void setValue_(Boolean value) { - subject.setPersist(value); + this.subject.setPersist(value.booleanValue()); } }; } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRefreshHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRefreshModel() { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { @Override protected Boolean buildValue_() { - return subject.isRefresh(); + return Boolean.valueOf(this.subject.isRefresh()); } @Override protected void setValue_(Boolean value) { - subject.setRefresh(value); + this.subject.setRefresh(value.booleanValue()); } }; } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRemoveHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRemoveModel() { + return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { @Override protected Boolean buildValue_() { - return subject.isRemove(); + return Boolean.valueOf(this.subject.isRemove()); } @Override protected void setValue_(Boolean value) { - subject.setRemove(value); + this.subject.setRemove(value.booleanValue()); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java deleted file mode 100644 index ba333ea92c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.Embeddable; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractEmbeddableUiDefinition<M, T extends Embeddable> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEmbeddableUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.EmbeddableUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.EmbeddableUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.EMBEDDABLE; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java index 31fe6cf97c..68c4c15000 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java @@ -12,7 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.layout.GridData; @@ -51,4 +53,12 @@ public abstract class AbstractEmbeddedIdMappingComposite<T extends EmbeddedIdMap protected abstract Control initializeEmbeddedIdSection(Composite container); + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java deleted file mode 100644 index 082fa02a8f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractEmbeddedIdMappingUiDefinition<M, T extends EmbeddedIdMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEmbeddedIdMappingUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.EmbeddedIdMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.EmbeddedIdMappingUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.EMBEDDED_ID; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java index 6a88b66ebd..d519396e27 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java @@ -12,7 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.layout.GridData; @@ -56,4 +58,13 @@ public abstract class AbstractEmbeddedMappingComposite<T extends EmbeddedMapping new EmbeddedMappingOverridesComposite(this, container); return container; } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java index b100eb278a..7cf2148cef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingUiDefinition.java @@ -10,31 +10,30 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.swt.widgets.Composite; -public abstract class AbstractEmbeddedMappingUiDefinition<M, T extends EmbeddedMapping> - extends AbstractMappingUiDefinition<M, T> +public abstract class AbstractEmbeddedMappingUiDefinition + extends AbstractMappingUiDefinition { protected AbstractEmbeddedMappingUiDefinition() { super(); } - public String getKey() { - return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.EmbeddedMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.EmbeddedMappingUiProvider_linkLabel; - } - @Override public ImageDescriptor getImageDescriptor() { return JptJpaUiImages.EMBEDDED; } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createEmbeddedMappingComposite((PropertyValueModel<EmbeddedMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java index 028643ddd4..9e92e4fc96 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java @@ -14,6 +14,7 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; import org.eclipse.jpt.jpa.core.context.IdClassReference; @@ -131,13 +132,13 @@ public abstract class AbstractEntityComposite<T extends Entity> //Id class widgets Hyperlink hyperlink = this.addHyperlink(container, JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<IdClassReference> buildIdClassReferenceHolder() { - return new PropertyAspectAdapter<Entity, IdClassReference>(getSubjectHolder()) { + protected PropertyValueModel<IdClassReference> buildIdClassReferenceModel() { + return new PropertyAspectAdapter<T, IdClassReference>(getSubjectHolder()) { @Override protected IdClassReference buildValue_() { return this.subject.getIdClassReference(); @@ -161,11 +162,11 @@ public abstract class AbstractEntityComposite<T extends Entity> } protected Control initializeQueriesSection(Composite container) { - return new QueriesComposite(this, this.buildQueryContainerHolder(), container).getControl(); + return new QueriesComposite(this, this.buildQueryContainerModel(), container).getControl(); } - protected PropertyValueModel<QueryContainer> buildQueryContainerHolder() { - return new PropertyAspectAdapter<Entity, QueryContainer>(getSubjectHolder()) { + protected PropertyValueModel<QueryContainer> buildQueryContainerModel() { + return new PropertyAspectAdapter<T, QueryContainer>(getSubjectHolder()) { @Override protected QueryContainer buildValue_() { return this.subject.getQueryContainer(); @@ -225,11 +226,11 @@ public abstract class AbstractEntityComposite<T extends Entity> } protected Control initializeGeneratorsSection(Composite container) { - return new GenerationComposite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new GenerationComposite(this, this.buildGeneratorContainerModel(), container).getControl(); } - protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerHolder() { - return new PropertyAspectAdapter<Entity, GeneratorContainer>(getSubjectHolder()) { + protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { + return new PropertyAspectAdapter<T, GeneratorContainer>(getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { return this.subject.getGeneratorContainer(); @@ -254,4 +255,14 @@ public abstract class AbstractEntityComposite<T extends Entity> protected abstract Control initializeSecondaryTablesSection(Composite container); + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentType(); + } + }; + } + }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java deleted file mode 100644 index e4c5e49d70..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.Entity; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractEntityUiDefinition<M, T extends Entity> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractEntityUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.ENTITY_TYPE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.EntityUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.EntityUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.ENTITY; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java index 31828d9fd7..81234c62b6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java @@ -16,6 +16,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.Converter; @@ -105,7 +106,7 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping> new IdMappingGenerationComposite(this, container); } - protected PropertyValueModel<? extends Column> buildColumnHolder() { + protected PropertyValueModel<? extends Column> buildColumnModel() { return new TransformationPropertyValueModel<T, Column>(getSubjectHolder()) { @Override protected Column transform_(T value) { @@ -148,4 +149,13 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping> } }; } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java index e96be310b9..9fdc6d8fca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java @@ -41,11 +41,17 @@ import org.eclipse.ui.forms.widgets.Section; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> */ -public abstract class AbstractJavaMappedSuperclassComposite - extends AbstractMappedSuperclassComposite<JavaMappedSuperclass> -{ +public abstract class AbstractJavaMappedSuperclassComposite<T extends JavaMappedSuperclass> + extends AbstractMappedSuperclassComposite<T> { + /** + * Creates a new <code>MappedSuperclassComposite</code>. + * + * @param subjectHolder The holder of this pane's subject + * @param parent The parent container + * @param widgetFactory The factory used to create various common widgets + */ public AbstractJavaMappedSuperclassComposite( - PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + PropertyValueModel<? extends T> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -74,11 +80,11 @@ public abstract class AbstractJavaMappedSuperclassComposite } protected Control initializeQueriesSection(Composite container) { - return new QueriesComposite(this, this.buildQueryContainerHolder(), container).getControl(); + return new QueriesComposite(this, this.buildQueryContainerModel(), container).getControl(); } - protected PropertyValueModel<QueryContainer> buildQueryContainerHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, QueryContainer>(getSubjectHolder()) { + protected PropertyValueModel<QueryContainer> buildQueryContainerModel() { + return new PropertyAspectAdapter<T, QueryContainer>(this.getSubjectHolder()) { @Override protected QueryContainer buildValue_() { return this.subject.getQueryContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java index ddb1e502a4..0130d3aaa3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJpaDetailsPageManager.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Control; */ public abstract class AbstractJpaDetailsPageManager<T extends JpaStructureNode> extends Pane<T> - implements JpaDetailsPageManager<T> + implements JpaDetailsPageManager { protected AbstractJpaDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { super(new SimplePropertyValueModel<T>(), parent, widgetFactory, resourceManager); @@ -42,7 +42,7 @@ public abstract class AbstractJpaDetailsPageManager<T extends JpaStructureNode> } @SuppressWarnings("unchecked") - public final void setSubject(Object subject) { + public final void setSubject(JpaStructureNode subject) { ModifiablePropertyValueModel<T> subjectHolder = (ModifiablePropertyValueModel<T>) getSubjectHolder(); subjectHolder.setValue((T) subject); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java index 2fdb13fc89..7892a73dfb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java @@ -28,7 +28,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMapping, R extends ManyToManyRelationship> +public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMapping, R extends ManyToManyRelationship, C extends Cascade> extends Pane<T> implements JpaComposite { @@ -61,7 +61,7 @@ public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMap protected abstract Control initializeManyToManySection(Composite container); protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new ManyToManyJoiningStrategyPane(this, buildJoiningHolder(), container); + new ManyToManyJoiningStrategyPane(this, buildRelationshipModel(), container); } protected void initializeOrderingCollapsibleSection(Composite container) { @@ -84,9 +84,8 @@ public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMap } - protected PropertyValueModel<R> buildJoiningHolder() { - return new TransformationPropertyValueModel<T, R>( - getSubjectHolder()) { + protected PropertyValueModel<R> buildRelationshipModel() { + return new TransformationPropertyValueModel<T, R>(getSubjectHolder()) { @SuppressWarnings("unchecked") @Override protected R transform_(T value) { @@ -95,16 +94,17 @@ public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMap }; } - protected PropertyValueModel<Cascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<T, Cascade>(getSubjectHolder()) { + protected PropertyValueModel<C> buildCascadeModel() { + return new TransformationPropertyValueModel<T, C>(getSubjectHolder()) { + @SuppressWarnings("unchecked") @Override - protected Cascade transform_(T value) { - return value.getCascade(); + protected C transform_(T value) { + return (C) value.getCascade(); } }; } - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { @Override protected AccessHolder buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java deleted file mode 100644 index d5f9270d4b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingUiDefinition.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractManyToManyMappingUiDefinition<M, T extends ManyToManyMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractManyToManyMappingUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.ManyToManyMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.ManyToManyMappingUiProvider_linkLabel; - } - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.MANY_TO_MANY; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java index 461ced94e6..e69af830f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; @@ -24,7 +26,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMapping, R extends ManyToOneRelationship> +public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMapping, R extends ManyToOneRelationship, C extends Cascade> extends Pane<T> implements JpaComposite { @@ -56,21 +58,21 @@ public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMappi protected abstract Control initializeManyToOneSection(Composite container); protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new ManyToOneJoiningStrategyPane(this, buildJoiningHolder(), container); + new ManyToOneJoiningStrategyPane(this, buildRelationshipModel(), container); } - protected PropertyValueModel<Cascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<T, Cascade>(getSubjectHolder()) { + protected PropertyValueModel<C> buildCascadeModel() { + return new TransformationPropertyValueModel<T, C>(getSubjectHolder()) { + @SuppressWarnings("unchecked") @Override - protected Cascade transform_(T value) { - return value.getCascade(); + protected C transform_(T value) { + return (C) value.getCascade(); } }; } - protected PropertyValueModel<R> buildJoiningHolder() { - return new TransformationPropertyValueModel<T, R>( - getSubjectHolder()) { + protected PropertyValueModel<R> buildRelationshipModel() { + return new TransformationPropertyValueModel<T, R>(getSubjectHolder()) { @SuppressWarnings("unchecked") @Override protected R transform_(T value) { @@ -78,4 +80,14 @@ public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMappi } }; } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<ManyToOneMapping, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } + } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java deleted file mode 100644 index 8414ba18d9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractManyToOneMappingUiDefinition<M, T extends ManyToOneMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractManyToOneMappingUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.ManyToOneMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.ManyToOneMappingUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.MANY_TO_ONE; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java index 5a826376a7..f4db897160 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java @@ -14,6 +14,7 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.IdClassReference; import org.eclipse.jpt.jpa.core.context.MappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; @@ -55,12 +56,12 @@ public abstract class AbstractMappedSuperclassComposite<T extends MappedSupercla container = this.addSubPane(container, 2, 0, 0, 0, 0); Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - protected PropertyValueModel<IdClassReference> buildIdClassReferenceHolder() { + protected PropertyValueModel<IdClassReference> buildIdClassReferenceModel() { return new PropertyAspectAdapter<T, IdClassReference>(getSubjectHolder()) { @Override protected IdClassReference buildValue_() { @@ -68,4 +69,13 @@ public abstract class AbstractMappedSuperclassComposite<T extends MappedSupercla } }; } -}
\ No newline at end of file + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(this.getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentType(); + } + }; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java deleted file mode 100644 index 9130279b0b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.MappedSuperclass; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractMappedSuperclassUiDefinition<M, T extends MappedSuperclass> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractMappedSuperclassUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.MappedSuperclassUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.MappedSuperclassUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.MAPPED_SUPERCLASS; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingResourceUiDefinition.java new file mode 100644 index 0000000000..9c26ceed98 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingResourceUiDefinition.java @@ -0,0 +1,129 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import java.util.ArrayList; +import java.util.List; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AttributeMapping; +import org.eclipse.jpt.jpa.core.context.TypeMapping; +import org.eclipse.jpt.jpa.ui.MappingResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.AbstractResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddableUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EntityUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.MappedSuperclassUiDefinition; +import org.eclipse.swt.widgets.Composite; + +/** + * All the state in the definition should be "static" + * (i.e. unchanging once it is initialized). + */ +public abstract class AbstractMappingResourceUiDefinition + extends AbstractResourceUiDefinition + implements MappingResourceUiDefinition +{ + private final JpaUiFactory factory; + + private ArrayList<MappingUiDefinition> typeMappingUiDefinitions; + + private ArrayList<MappingUiDefinition> specifiedAttributeMappingUiDefinitions; + + /** + * zero-argument constructor + */ + protected AbstractMappingResourceUiDefinition() { + super(); + this.factory = this.buildUiFactory(); + } + + protected abstract JpaUiFactory buildUiFactory(); + + + // ********** type mappings ********** + + public JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + MappingUiDefinition definition = this.getTypeMappingUiDefinition(mappingModel.getValue()); + return definition.buildMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + protected MappingUiDefinition getTypeMappingUiDefinition(TypeMapping typeMapping) { + String mappingKey = (typeMapping == null) ? null : typeMapping.getKey(); + return this.getTypeMappingUiDefinition(mappingKey); + } + + public MappingUiDefinition getTypeMappingUiDefinition(String mappingKey) { + return (mappingKey == null) ? + this.getDefaultTypeMappingUiDefinition() : + this.getTypeMappingUiDefinition_(mappingKey); + } + + protected MappingUiDefinition getTypeMappingUiDefinition_(String mappingKey) { + for (MappingUiDefinition definition : this.getTypeMappingUiDefinitions()) { + if (ObjectTools.equals(definition.getKey(), mappingKey)) { + return definition; + } + } + throw new IllegalArgumentException("Illegal type mapping key: " + mappingKey); //$NON-NLS-1$ + } + + public synchronized Iterable<MappingUiDefinition> getTypeMappingUiDefinitions() { + if (this.typeMappingUiDefinitions == null) { + this.typeMappingUiDefinitions = this.buildTypeMappingUiDefinitions(); + } + return this.typeMappingUiDefinitions; + } + + protected ArrayList<MappingUiDefinition> buildTypeMappingUiDefinitions() { + ArrayList<MappingUiDefinition> definitions = new ArrayList<MappingUiDefinition>(); + this.addTypeMappingUiDefinitionsTo(definitions); + return definitions; + } + + protected void addTypeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(EntityUiDefinition.instance()); + definitions.add(MappedSuperclassUiDefinition.instance()); + definitions.add(EmbeddableUiDefinition.instance()); + } + + + // ********** attribute mappings ********** + + public JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + MappingUiDefinition definition = this.getAttributeMappingUiDefinition(mappingModel.getValue()); + return definition.buildMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + protected MappingUiDefinition getAttributeMappingUiDefinition(AttributeMapping attributeMapping) { + String mappingKey = (attributeMapping == null) ? null : attributeMapping.getKey(); + return this.getAttributeMappingUiDefinition(mappingKey); + } + + public synchronized Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions() { + if (this.specifiedAttributeMappingUiDefinitions == null) { + this.specifiedAttributeMappingUiDefinitions = this.buildSpecifiedAttributeMappingUiDefinitions(); + } + return this.specifiedAttributeMappingUiDefinitions; + } + + protected ArrayList<MappingUiDefinition> buildSpecifiedAttributeMappingUiDefinitions() { + ArrayList<MappingUiDefinition> definitions = new ArrayList<MappingUiDefinition>(); + this.addSpecifiedAttributeMappingUiDefinitionsTo(definitions); + return definitions; + } + + protected abstract void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions); + +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java index 60dcae7472..0c14365a05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappingUiDefinition.java @@ -10,11 +10,12 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -public abstract class AbstractMappingUiDefinition<M, T> - implements MappingUiDefinition<M, T> +public abstract class AbstractMappingUiDefinition + implements MappingUiDefinition { protected AbstractMappingUiDefinition() { super(); @@ -24,7 +25,7 @@ public abstract class AbstractMappingUiDefinition<M, T> return JptJpaUiImages.JPA_CONTENT; } - public boolean isEnabledFor(M mappableObject) { + public boolean isEnabledFor(JpaContextNode node) { return true; } -} +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java index 42728d20f0..53cbdbc3e3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToManyRelationship; @@ -26,7 +28,7 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMapping, R extends OneToManyRelationship> +public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMapping, R extends OneToManyRelationship, C extends Cascade> extends Pane<T> implements JpaComposite { @@ -59,7 +61,7 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi protected abstract Control initializeOneToManySection(Composite container); protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToManyJoiningStrategyPane(this, buildJoiningHolder(), container); + new OneToManyJoiningStrategyPane(this, buildRelationshipModel(), container); } protected void initializeOrderingCollapsibleSection(Composite container) { @@ -81,7 +83,7 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi return new OrderingComposite(this, container).getControl(); } - protected PropertyValueModel<R> buildJoiningHolder() { + protected PropertyValueModel<R> buildRelationshipModel() { return new TransformationPropertyValueModel<T, R>(getSubjectHolder()) { @SuppressWarnings("unchecked") @Override @@ -91,11 +93,21 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi }; } - protected PropertyValueModel<Cascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<T, Cascade>(getSubjectHolder()) { + protected PropertyValueModel<C> buildCascadeModel() { + return new TransformationPropertyValueModel<T, C>(getSubjectHolder()) { + @SuppressWarnings("unchecked") + @Override + protected C transform_(T mapping) { + return (C) mapping.getCascade(); + } + }; + } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { @Override - protected Cascade transform_(T mapping) { - return mapping.getCascade(); + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java index b83f1c29ff..7049d22ac9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingUiDefinition.java @@ -10,31 +10,30 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.swt.widgets.Composite; -public abstract class AbstractOneToManyMappingUiDefinition<M, T extends OneToManyMapping> - extends AbstractMappingUiDefinition<M, T> +public abstract class AbstractOneToManyMappingUiDefinition + extends AbstractMappingUiDefinition { protected AbstractOneToManyMappingUiDefinition() { super(); } - public String getKey() { - return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.OneToManyMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.OneToManyMappingUiProvider_linkLabel; - } - @Override public ImageDescriptor getImageDescriptor() { return JptJpaUiImages.ONE_TO_MANY; } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createOneToManyMappingComposite((PropertyValueModel<OneToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java index 2b436993b9..52c0691cf1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java @@ -12,8 +12,10 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; @@ -24,7 +26,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping, R extends OneToOneRelationship> +public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping, R extends OneToOneRelationship, C extends Cascade> extends Pane<T> implements JpaComposite { @@ -56,12 +58,11 @@ public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping protected abstract Control initializeOneToOneSection(Composite container); protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToOneJoiningStrategyPane(this, buildJoiningHolder(), container); + new OneToOneJoiningStrategyPane(this, buildRelationshipModel(), container); } - protected PropertyValueModel<R> buildJoiningHolder() { - return new TransformationPropertyValueModel<T, R>( - getSubjectHolder()) { + protected PropertyValueModel<R> buildRelationshipModel() { + return new TransformationPropertyValueModel<T, R>(getSubjectHolder()) { @SuppressWarnings("unchecked") @Override protected R transform_(T value) { @@ -70,11 +71,21 @@ public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping }; } - protected PropertyValueModel<Cascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<T, Cascade>(getSubjectHolder()) { + protected PropertyValueModel<C> buildCascadeModel() { + return new TransformationPropertyValueModel<T, C>(getSubjectHolder()) { + @SuppressWarnings("unchecked") + @Override + protected C transform_(T value) { + return (C) value.getCascade(); + } + }; + } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { @Override - protected Cascade transform_(T value) { - return value.getCascade(); + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java index 9b2ac9e558..83976288eb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingUiDefinition.java @@ -10,31 +10,31 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.swt.widgets.Composite; -public abstract class AbstractOneToOneMappingUiDefinition<M, T extends OneToOneMapping> - extends AbstractMappingUiDefinition<M, T> +public abstract class AbstractOneToOneMappingUiDefinition + extends AbstractMappingUiDefinition { protected AbstractOneToOneMappingUiDefinition() { super(); } - public String getKey() { - return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; - } - public String getLabel() { - return JptUiDetailsMessages.OneToOneMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.OneToOneMappingUiProvider_linkLabel; - } - @Override public ImageDescriptor getImageDescriptor() { return JptJpaUiImages.ONE_TO_ONE; } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createOneToOneMappingComposite((PropertyValueModel<OneToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java index 2e56aa175c..a159c69e1c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java @@ -38,24 +38,25 @@ import org.eclipse.swt.widgets.Composite; * @see ManyToManyMappingComposite * @see OneToManyMappingComposite */ -public abstract class AbstractOrderingComposite +public abstract class AbstractOrderingComposite<T extends Orderable> extends Pane<CollectionMapping> { protected AbstractOrderingComposite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) { super(parentPane, parentComposite); } - protected PropertyValueModel<Orderable> buildOrderableHolder() { - return new PropertyAspectAdapter<CollectionMapping, Orderable>(getSubjectHolder()) { + protected PropertyValueModel<T> buildOrderableModel() { + return new PropertyAspectAdapter<CollectionMapping, T>(getSubjectHolder()) { + @SuppressWarnings("unchecked") @Override - protected Orderable buildValue_() { - return this.subject.getOrderable(); + protected T buildValue_() { + return (T) this.subject.getOrderable(); } }; } - protected ModifiablePropertyValueModel<Boolean> buildNoOrderingHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, Boolean>(orderableHolder, Orderable.NO_ORDERING_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildNoOrderingHolder(PropertyValueModel<T> orderableHolder) { + return new PropertyAspectAdapter<T, Boolean>(orderableHolder, Orderable.NO_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isNoOrdering()); @@ -68,8 +69,8 @@ public abstract class AbstractOrderingComposite }; } - protected ModifiablePropertyValueModel<Boolean> buildPrimaryKeyOrderingHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, Boolean>(orderableHolder, Orderable.PK_ORDERING_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildPrimaryKeyOrderingHolder(PropertyValueModel<T> orderableHolder) { + return new PropertyAspectAdapter<T, Boolean>(orderableHolder, Orderable.PK_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isPkOrdering()); @@ -82,8 +83,8 @@ public abstract class AbstractOrderingComposite }; } - protected ModifiablePropertyValueModel<Boolean> buildCustomOrderingHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, Boolean>(orderableHolder, Orderable.CUSTOM_ORDERING_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCustomOrderingHolder(PropertyValueModel<T> orderableHolder) { + return new PropertyAspectAdapter<T, Boolean>(orderableHolder, Orderable.CUSTOM_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isCustomOrdering()); @@ -96,8 +97,8 @@ public abstract class AbstractOrderingComposite }; } - protected ModifiablePropertyValueModel<String> buildSpecifiedOrderByHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, String>(orderableHolder, Orderable.SPECIFIED_ORDER_BY_PROPERTY) { + protected ModifiablePropertyValueModel<String> buildSpecifiedOrderByHolder(PropertyValueModel<T> orderableHolder) { + return new PropertyAspectAdapter<T, String>(orderableHolder, Orderable.SPECIFIED_ORDER_BY_PROPERTY) { @Override protected String buildValue_() { return this.subject.getSpecifiedOrderBy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java deleted file mode 100644 index fc0bc443de..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractTransientMappingUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.TransientMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractTransientMappingUiDefinition<M, T extends TransientMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractTransientMappingUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.TransientMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.TransientMappingUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.TRANSIENT; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java index b1a4b53eab..4cf9cc901b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java @@ -16,6 +16,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.Converter; @@ -115,7 +116,7 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping> return container; } - protected PropertyValueModel<Column> buildColumnHolder() { + protected PropertyValueModel<Column> buildColumnModel() { return new TransformationPropertyValueModel<T, Column>(getSubjectHolder()) { @Override protected Column transform_(T value) { @@ -158,4 +159,13 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping> } }; } + + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java deleted file mode 100644 index 189e1a7d08..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingUiDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.VersionMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; - -public abstract class AbstractVersionMappingUiDefinition<M, T extends VersionMapping> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractVersionMappingUiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages.VersionMappingUiProvider_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages.VersionMappingUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.VERSION; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingUiDefinition.java index 49a54485a0..2485873880 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BasicMappingUiDefinition.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2012 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. @@ -9,33 +9,41 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.IdMapping; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; - -public abstract class AbstractIdMappingUiDefinition<M, T extends IdMapping> - extends AbstractMappingUiDefinition<M, T> +public class BasicMappingUiDefinition + extends AbstractBasicMappingUiDefinition { - protected AbstractIdMappingUiDefinition() { + // singleton + private static final BasicMappingUiDefinition INSTANCE = + new BasicMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private BasicMappingUiDefinition() { super(); } public String getKey() { - return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String getLabel() { - return JptUiDetailsMessages.IdMappingUiProvider_label; + return JptUiDetailsMessages.BasicMappingUiProvider_label; } - + public String getLinkLabel() { - return JptUiDetailsMessages.IdMappingUiProvider_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.ID; + return JptUiDetailsMessages.BasicMappingUiProvider_linkLabel; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadePane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadePane.java new file mode 100644 index 0000000000..fdb4ab7d49 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/CascadePane.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jpt.common.ui.internal.widgets.Pane; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; +import org.eclipse.jpt.jpa.core.context.RelationshipMapping; +import org.eclipse.swt.widgets.Composite; + +/** + * Here the layout of this pane: + * <pre> + * ----------------------------------------------------------------------------- + * | - Cascade --------------------------------------------------------------- | + * | | | | + * | | x All x Persist x Merge x Remove x Refresh | | + * | | | | + * | ------------------------------------------------------------------------- | + * -----------------------------------------------------------------------------</pre> + * + * @see Cascade + * @see RelationshipMapping + * @see ManyToManyMappingComposite + * @see ManyToOneMappingComposite + * @see OneToManyMappingComposite + * @see OneToOneMappingComposite + */ +public class CascadePane + extends AbstractCascadePane<Cascade> +{ + public CascadePane( + Pane<? extends RelationshipMapping> parentPane, + PropertyValueModel<? extends Cascade> cascadeModel, + Composite parent + ) { + super(parentPane, cascadeModel, parent); + } + + @Override + protected void initializeLayout(Composite container) { + addAllCheckBox(container); + addPersistCheckBox(container); + addMergeCheckBox(container); + addRemoveCheckBox(container); + addRefreshCheckBox(container); + } + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddableUiDefinition.java new file mode 100644 index 0000000000..38868677b5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddableUiDefinition.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EmbeddableUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EmbeddableUiDefinition INSTANCE = new EmbeddableUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EmbeddableUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.EmbeddableUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.EmbeddableUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.EMBEDDABLE; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createEmbeddableComposite((PropertyValueModel<Embeddable>) mappingModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingUiDefinition.java new file mode 100644 index 0000000000..58fb733c8f --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EmbeddedIdMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EmbeddedIdMappingUiDefinition INSTANCE = + new EmbeddedIdMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EmbeddedIdMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.EmbeddedIdMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.EmbeddedIdMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.EMBEDDED_ID; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createEmbeddedIdMappingComposite((PropertyValueModel<EmbeddedIdMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingUiDefinition.java new file mode 100644 index 0000000000..2301c37047 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingUiDefinition.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; + +public class EmbeddedMappingUiDefinition + extends AbstractEmbeddedMappingUiDefinition +{ + // singleton + private static final EmbeddedMappingUiDefinition INSTANCE = + new EmbeddedMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EmbeddedMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.EmbeddedMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.EmbeddedMappingUiProvider_linkLabel; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityUiDefinition.java new file mode 100644 index 0000000000..fe94d04788 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class EntityUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final EntityUiDefinition INSTANCE = + new EntityUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private EntityUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.EntityUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.EntityUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.ENTITY; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createEntityComposite((PropertyValueModel<Entity>) mappingModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java index 4f79fbcf6c..086c5f09bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java @@ -33,7 +33,7 @@ public class IdMappingComposite protected Control initializeIdSection(Composite container) { container = this.addSubPane(container); - new ColumnComposite(this, buildColumnHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); return container; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingUiDefinition.java new file mode 100644 index 0000000000..f363a95048 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class IdMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final IdMappingUiDefinition INSTANCE = + new IdMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + protected IdMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.IdMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.IdMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.ID; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createIdMappingComposite((PropertyValueModel<IdMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java index bc0993ce93..6f73366e29 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingComposite.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; import org.eclipse.swt.layout.GridData; @@ -20,7 +21,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class ManyToManyMappingComposite - extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship> + extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship, Cascade> { public ManyToManyMappingComposite( PropertyValueModel<? extends ManyToManyMapping> mappingModel, @@ -44,7 +45,7 @@ public class ManyToManyMappingComposite new FetchTypeComboViewer(this, container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingUiDefinition.java new file mode 100644 index 0000000000..85582df4af --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class ManyToManyMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final ManyToManyMappingUiDefinition INSTANCE = + new ManyToManyMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private ManyToManyMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.ManyToManyMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.ManyToManyMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.MANY_TO_MANY; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createManyToManyMappingComposite((PropertyValueModel<ManyToManyMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java index 7f5765d5a2..cdcc506ea4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingComposite.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; import org.eclipse.swt.layout.GridData; @@ -20,7 +21,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class ManyToOneMappingComposite - extends AbstractManyToOneMappingComposite<ManyToOneMapping, ManyToOneRelationship> + extends AbstractManyToOneMappingComposite<ManyToOneMapping, ManyToOneRelationship, Cascade> { public ManyToOneMappingComposite( PropertyValueModel<? extends ManyToOneMapping> mappingModel, @@ -50,7 +51,7 @@ public class ManyToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadePane = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadePane = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingUiDefinition.java new file mode 100644 index 0000000000..ccd53e5c62 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class ManyToOneMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final ManyToOneMappingUiDefinition INSTANCE = + new ManyToOneMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private ManyToOneMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.ManyToOneMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.ManyToOneMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.MANY_TO_ONE; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createManyToOneMappingComposite((PropertyValueModel<ManyToOneMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java index b3b5c6b530..b42d7a6723 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MapAsComposite.java @@ -64,7 +64,7 @@ public abstract class MapAsComposite<T extends JpaNode> extends Pane<T> { protected boolean dragEvent; - protected MappingChangeHandler<T> mappingChangeHandler; + protected MappingChangeHandler mappingChangeHandler; protected int mappingTypeLength; protected int mappingTypeStart; protected boolean mouseDown; @@ -115,7 +115,7 @@ public abstract class MapAsComposite<T extends JpaNode> * * @return A new <code>MappingChangeHandler</code> */ - protected abstract MappingChangeHandler<T> buildMappingChangeHandler(); + protected abstract MappingChangeHandler buildMappingChangeHandler(); private MouseListener buildMouseListener() { return new MouseListener() { @@ -305,7 +305,7 @@ public abstract class MapAsComposite<T extends JpaNode> MappingSelectionDialog dialog = new MappingSelectionDialog(this.getShell(), this.getResourceManager()); dialog.setBlockOnOpen(true); if (dialog.open() == IDialogConstants.OK_ID) { - MappingUiDefinition<?,?> definition = (MappingUiDefinition<?,?>) dialog.getFirstResult(); + MappingUiDefinition definition = (MappingUiDefinition) dialog.getFirstResult(); morphMapping(definition); } } @@ -383,7 +383,7 @@ public abstract class MapAsComposite<T extends JpaNode> * This handler is responsible to give the text information and to open the * mapping dialog if the user clicked on the mapping type. */ - protected interface MappingChangeHandler<T> { + protected interface MappingChangeHandler { /** * Returns the entire text describing the mapping (entity or mapping) and @@ -406,7 +406,7 @@ public abstract class MapAsComposite<T extends JpaNode> * * @param provider The definition that was selected for changing the mapping */ - void morphMapping(MappingUiDefinition<T, ?> definition); + void morphMapping(MappingUiDefinition definition); /** * Returns the name of the current mapping. @@ -420,7 +420,7 @@ public abstract class MapAsComposite<T extends JpaNode> * * @return The supported types of mapping */ - Iterable<MappingUiDefinition<T, ?>> getMappingUiDefinitions(); + Iterable<MappingUiDefinition> getMappingUiDefinitions(); /** * Returns the mapping UI definition for current mapping @@ -428,7 +428,7 @@ public abstract class MapAsComposite<T extends JpaNode> * * @return The supported types of mapping */ - MappingUiDefinition<T, ?> getMappingUiDefinition(); + MappingUiDefinition getMappingUiDefinition(); } /** @@ -438,7 +438,7 @@ public abstract class MapAsComposite<T extends JpaNode> protected class MappingSelectionDialog extends FilteredItemsSelectionDialog { - private MappingUiDefinition<?,?> defaultDefinition; + private MappingUiDefinition defaultDefinition; /** * Creates a new <code>MappingSelectionDialog</code>. @@ -488,9 +488,7 @@ public abstract class MapAsComposite<T extends JpaNode> // Add the registered mapping providers to the dialog for (MappingUiDefinition mappingDefinition : mappingChangeHandler.getMappingUiDefinitions()) { - if (mappingDefinition.isEnabledFor(getSubject())) { - provider.add(mappingDefinition, itemsFilter); - } + provider.add(mappingDefinition, itemsFilter); } } finally { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedSuperclassUiDefinition.java new file mode 100644 index 0000000000..8ea33c79ca --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedSuperclassUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class MappedSuperclassUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final MappedSuperclassUiDefinition INSTANCE = + new MappedSuperclassUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private MappedSuperclassUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.MappedSuperclassUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.MappedSuperclassUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.MAPPED_SUPERCLASS; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createMappedSuperclassComposite((PropertyValueModel<MappedSuperclass>) mappingModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java index e6bbe75cd4..b5269aa398 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingComposite.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToManyRelationship; import org.eclipse.swt.layout.GridData; @@ -20,7 +21,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OneToManyMappingComposite - extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship> + extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship, Cascade> { public OneToManyMappingComposite( PropertyValueModel<? extends OneToManyMapping> mappingModel, @@ -44,7 +45,7 @@ public class OneToManyMappingComposite new FetchTypeComboViewer(this, container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingUiDefinition.java new file mode 100644 index 0000000000..c45aea3597 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyMappingUiDefinition.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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.ui.internal.details; + +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; + +public class OneToManyMappingUiDefinition + extends AbstractOneToManyMappingUiDefinition +{ + // singleton + private static final OneToManyMappingUiDefinition INSTANCE = + new OneToManyMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private OneToManyMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.OneToManyMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.OneToManyMappingUiProvider_linkLabel; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java index 25a1d6bfb7..f46486c1af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; import org.eclipse.swt.layout.GridData; @@ -20,7 +21,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OneToOneMappingComposite - extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship> + extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship, Cascade> { public OneToOneMappingComposite( PropertyValueModel<? extends OneToOneMapping> mappingModel, @@ -50,7 +51,7 @@ public class OneToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingUiDefinition.java new file mode 100644 index 0000000000..ea342292f9 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingUiDefinition.java @@ -0,0 +1,49 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; + +public class OneToOneMappingUiDefinition + extends AbstractOneToOneMappingUiDefinition +{ + // singleton + private static final OneToOneMappingUiDefinition INSTANCE = + new OneToOneMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private OneToOneMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.OneToOneMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.OneToOneMappingUiProvider_linkLabel; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java index 2069380724..5003c0aed8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderingComposite.java @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Text; * @see OneToManyMappingComposite */ public class OrderingComposite - extends AbstractOrderingComposite + extends AbstractOrderingComposite<Orderable> { public OrderingComposite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) { super(parentPane, parentComposite); @@ -48,7 +48,7 @@ public class OrderingComposite @Override protected void initializeLayout(Composite container) { - PropertyValueModel<Orderable> orderableHolder = buildOrderableHolder(); + PropertyValueModel<Orderable> orderableHolder = buildOrderableModel(); // No Ordering radio button addRadioButton( diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java index 1efa973e6a..2f1360a5c2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeMapAsComposite.java @@ -78,7 +78,7 @@ public class PersistentAttributeMapAsComposite return getSubject().getName(); } - public Iterable<? extends MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?>> getMappingUiDefinitions() { + public Iterable<MappingUiDefinition> getMappingUiDefinitions() { return getAttributeMappingUiDefinitions(); } @@ -87,11 +87,11 @@ public class PersistentAttributeMapAsComposite } } - protected Iterable<? extends MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?>> getAttributeMappingUiDefinitions() { - return getJpaPlatformUi().getAttributeMappingUiDefinitions(getSubject().getResourceType()); + protected Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions() { + return getJpaPlatformUi().getAttributeMappingUiDefinitions(getSubject()); } - protected MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?> getAttributeMappingUiDefinition() { + protected MappingUiDefinition getAttributeMappingUiDefinition() { return getJpaPlatformUi().getAttributeMappingUiDefinition(getSubject().getResourceType(), getMappingKey()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java index 5ae724247b..47f4e9999a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java @@ -16,6 +16,7 @@ import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher; import org.eclipse.jpt.common.utility.filter.Filter; import org.eclipse.jpt.common.utility.internal.model.value.FilteringPropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -119,13 +120,20 @@ public class PersistentTypeDetailsPageManager return this.getJpaPlatformUi().buildTypeMappingComposite( this.getSubject().getResourceType(), key, - pageBook, this.buildMappingHolder(key), + this.getMappingCompositeEnabledModel(), + pageBook, this.getWidgetFactory(), this.getResourceManager() ); } + private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = new StaticPropertyValueModel<Boolean>(Boolean.TRUE); + + protected PropertyValueModel<Boolean> getMappingCompositeEnabledModel() { + return TRUE_ENABLED_MODEL; + } + @Override public void controlDisposed() { JptJpaUiPlugin.instance().trace(TRACE_OPTION, "dispose"); //$NON-NLS-1$ diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java index 7d23fc4696..ee5e2f7022 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeMapAsComposite.java @@ -58,7 +58,7 @@ public class PersistentTypeMapAsComposite return getSubject().getSimpleName(); } - public Iterable<? extends MappingUiDefinition<? extends PersistentType, ?>> getMappingUiDefinitions() { + public Iterable<MappingUiDefinition> getMappingUiDefinitions() { return getTypeMappingUiDefinitions(); } @@ -72,11 +72,11 @@ public class PersistentTypeMapAsComposite * * @return The supported types of mapping */ - protected Iterable<? extends MappingUiDefinition<? extends PersistentType, ?>> getTypeMappingUiDefinitions() { - return getJpaPlatformUi().getTypeMappingUiDefinitions(getSubject().getResourceType()); + protected Iterable<MappingUiDefinition> getTypeMappingUiDefinitions() { + return getJpaPlatformUi().getTypeMappingUiDefinitions(getSubject()); } - protected MappingUiDefinition<? extends PersistentType, ?> getTypeMappingUiDefinition() { + protected MappingUiDefinition getTypeMappingUiDefinition() { return getJpaPlatformUi().getTypeMappingUiDefinition(getSubject().getResourceType(), getMappingKey()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingUiDefinition.java new file mode 100644 index 0000000000..e6a6430076 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TransientMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.TransientMapping; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class TransientMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final TransientMappingUiDefinition INSTANCE = + new TransientMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private TransientMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.TransientMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.TransientMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.TRANSIENT; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createTransientMappingComposite((PropertyValueModel<TransientMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java index a0780e747c..7159824b4b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingComposite.java @@ -48,7 +48,7 @@ public class VersionMappingComposite protected Control initializeVersionSection(Composite container) { container = this.addSubPane(container); //A Section with a Group(ColumnComposite) as its direct direct child throws exceptions - new ColumnComposite(this, buildColumnHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); return container; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingUiDefinition.java new file mode 100644 index 0000000000..374a61a50a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/VersionMappingUiDefinition.java @@ -0,0 +1,69 @@ +/******************************************************************************* + * 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.jpa.ui.internal.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.MappingKeys; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.swt.widgets.Composite; + +public class VersionMappingUiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final VersionMappingUiDefinition INSTANCE = + new VersionMappingUiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private VersionMappingUiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages.VersionMappingUiProvider_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages.VersionMappingUiProvider_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.VERSION; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return factory.createVersionMappingComposite((PropertyValueModel<VersionMapping>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java index 4c205714a3..be6ef1a1f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java @@ -11,47 +11,26 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import java.util.ArrayList; import java.util.List; -import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.jface.SimpleItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.common.utility.internal.iterable.SuperIterableWrapper; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.internal.context.java.JavaSourceFileDefinition; -import org.eclipse.jpt.jpa.ui.MappingResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.AbstractResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.structure.JavaStructureItemContentProviderFactory; import org.eclipse.jpt.jpa.ui.internal.structure.JavaStructureItemLabelProviderFactory; -import org.eclipse.swt.widgets.Composite; /** * All the state in the definition should be "static" * (i.e. unchanging once it is initialized). */ public abstract class AbstractJavaResourceUiDefinition - extends AbstractResourceUiDefinition - implements MappingResourceUiDefinition + extends AbstractMappingResourceUiDefinition { - private final JavaUiFactory factory; - private ArrayList<JavaTypeMappingUiDefinition<? extends TypeMapping>> specifiedTypeMappingUiDefinitions; - - private ArrayList<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> specifiedAttributeMappingUiDefinitions; - - private ArrayList<DefaultJavaAttributeMappingUiDefinition<?>> defaultAttributeMappingUiDefinitions; + private ArrayList<DefaultMappingUiDefinition> defaultAttributeMappingUiDefinitions; /** @@ -59,12 +38,8 @@ public abstract class AbstractJavaResourceUiDefinition */ protected AbstractJavaResourceUiDefinition() { super(); - this.factory = this.buildJavaUiFactory(); } - - protected abstract JavaUiFactory buildJavaUiFactory(); - public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(JavaSourceFileDefinition.instance().getResourceType()); } @@ -82,85 +57,21 @@ public abstract class AbstractJavaResourceUiDefinition // ********** type mappings ********** - public JpaComposite buildTypeMappingComposite(String mappingKey, PropertyValueModel<TypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - JavaTypeMappingUiDefinition<TypeMapping> definition = this.getJavaTypeMappingUiDefinition(mappingModel.getValue()); - return definition.buildTypeMappingComposite(this.factory, mappingModel, parentComposite, widgetFactory, resourceManager); - } - - @SuppressWarnings("unchecked") - protected JavaTypeMappingUiDefinition<TypeMapping> getJavaTypeMappingUiDefinition(TypeMapping typeMapping) { - return (JavaTypeMappingUiDefinition<TypeMapping>) this.getJavaTypeMappingUiDefinition_(typeMapping); - } - - protected JavaTypeMappingUiDefinition<? extends TypeMapping> getJavaTypeMappingUiDefinition_(TypeMapping typeMapping) { - String mappingKey = (typeMapping == null) ? null : typeMapping.getKey(); - return this.getTypeMappingUiDefinition(mappingKey); - } - - public JavaTypeMappingUiDefinition<? extends TypeMapping> getTypeMappingUiDefinition(String mappingKey) { - return (mappingKey == null) ? - this.getDefaultTypeMappingUiDefinition() : - this.getSpecifiedJavaTypeMappingUiDefinition(mappingKey); - } - - protected JavaTypeMappingUiDefinition<? extends TypeMapping> getSpecifiedJavaTypeMappingUiDefinition(String mappingKey) { - for (JavaTypeMappingUiDefinition<? extends TypeMapping> definition : this.getSpecifiedTypeMappingUiDefinitions()) { - if (ObjectTools.equals(definition.getKey(), mappingKey)) { - return definition; - } - } - throw new IllegalArgumentException("Illegal type mapping key: " + mappingKey); //$NON-NLS-1$ - } - - public Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions() { - return new SuperIterableWrapper<MappingUiDefinition<PersistentType, ? extends TypeMapping>>(this.getSpecifiedTypeMappingUiDefinitions()); - } - - protected synchronized Iterable<JavaTypeMappingUiDefinition<? extends TypeMapping>> getSpecifiedTypeMappingUiDefinitions() { - if (this.specifiedTypeMappingUiDefinitions == null) { - this.specifiedTypeMappingUiDefinitions = this.buildSpecifiedTypeMappingUiDefinitions(); - } - return this.specifiedTypeMappingUiDefinitions; - } - - protected ArrayList<JavaTypeMappingUiDefinition<? extends TypeMapping>> buildSpecifiedTypeMappingUiDefinitions() { - ArrayList<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions = new ArrayList<JavaTypeMappingUiDefinition<? extends TypeMapping>>(); - this.addSpecifiedTypeMappingUiDefinitionsTo(definitions); - return definitions; - } - - protected abstract void addSpecifiedTypeMappingUiDefinitionsTo(List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions); - - public DefaultJavaTypeMappingUiDefinition<? extends TypeMapping> getDefaultTypeMappingUiDefinition() { + public DefaultMappingUiDefinition getDefaultTypeMappingUiDefinition() { return NullJavaTypeMappingUiDefinition.instance(); } // ********** attribute mappings ********** - public JpaComposite buildAttributeMappingComposite(String mappingKey, PropertyValueModel<AttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - JavaAttributeMappingUiDefinition<AttributeMapping> definition = this.getAttributeMappingUiDefinition(mappingModel.getValue()); - return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - @SuppressWarnings("unchecked") - protected JavaAttributeMappingUiDefinition<AttributeMapping> getAttributeMappingUiDefinition(AttributeMapping attributeMapping) { - return (JavaAttributeMappingUiDefinition<AttributeMapping>) this.getAttributeMappingUiDefinition_(attributeMapping); - } - - protected JavaAttributeMappingUiDefinition<? extends AttributeMapping> getAttributeMappingUiDefinition_(AttributeMapping attributeMapping) { - String mappingKey = (attributeMapping == null) ? null : attributeMapping.getKey(); - return this.getAttributeMappingUiDefinition(mappingKey); - } - - public JavaAttributeMappingUiDefinition<? extends AttributeMapping> getAttributeMappingUiDefinition(String mappingKey) { + public MappingUiDefinition getAttributeMappingUiDefinition(String mappingKey) { return (mappingKey == null) ? this.getDefaultAttributeMappingUiDefinition(mappingKey) : this.getSpecifiedAttributeMappingUiDefinition(mappingKey); } - protected JavaAttributeMappingUiDefinition<? extends AttributeMapping> getSpecifiedAttributeMappingUiDefinition(String mappingKey) { - for (JavaAttributeMappingUiDefinition<? extends AttributeMapping> definition : this.getSpecifiedAttributeMappingUiDefinitions()) { + protected MappingUiDefinition getSpecifiedAttributeMappingUiDefinition(String mappingKey) { + for (MappingUiDefinition definition : this.getAttributeMappingUiDefinitions()) { if (ObjectTools.equals(definition.getKey(), mappingKey)) { return definition; } @@ -168,30 +79,11 @@ public abstract class AbstractJavaResourceUiDefinition throw new IllegalArgumentException("Illegal attribute mapping key: " + mappingKey); //$NON-NLS-1$ } - public Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions() { - return new SuperIterableWrapper<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>>(this.getSpecifiedAttributeMappingUiDefinitions()); - } - - protected synchronized ArrayList<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> getSpecifiedAttributeMappingUiDefinitions() { - if (this.specifiedAttributeMappingUiDefinitions == null) { - this.specifiedAttributeMappingUiDefinitions = this.buildSpecifiedAttributeMappingUiDefinitions(); - } - return this.specifiedAttributeMappingUiDefinitions; - } - - protected ArrayList<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> buildSpecifiedAttributeMappingUiDefinitions() { - ArrayList<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions = new ArrayList<JavaAttributeMappingUiDefinition<? extends AttributeMapping>>(); - this.addSpecifiedAttributeMappingUiDefinitionsTo(definitions); - return definitions; - } - - protected abstract void addSpecifiedAttributeMappingUiDefinitionsTo(List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions); - // ********** default attribute mappings ********** - public DefaultJavaAttributeMappingUiDefinition<? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(String mappingKey) { - for (DefaultJavaAttributeMappingUiDefinition<? extends AttributeMapping> definition : this.getDefaultAttributeMappingUiDefinitions()) { + public DefaultMappingUiDefinition getDefaultAttributeMappingUiDefinition(String mappingKey) { + for (DefaultMappingUiDefinition definition : this.getDefaultAttributeMappingUiDefinitions()) { if (ObjectTools.equals(definition.getDefaultKey(), mappingKey)) { return definition; } @@ -199,19 +91,19 @@ public abstract class AbstractJavaResourceUiDefinition throw new IllegalArgumentException("Illegal attribute mapping key: " + mappingKey); //$NON-NLS-1$ } - protected synchronized ArrayList<DefaultJavaAttributeMappingUiDefinition<? extends AttributeMapping>> getDefaultAttributeMappingUiDefinitions() { + protected synchronized ArrayList<DefaultMappingUiDefinition> getDefaultAttributeMappingUiDefinitions() { if (this.defaultAttributeMappingUiDefinitions == null) { this.defaultAttributeMappingUiDefinitions = this.buildDefaultAttributeMappingUiDefinitions(); } return this.defaultAttributeMappingUiDefinitions; } - protected ArrayList<DefaultJavaAttributeMappingUiDefinition<?>> buildDefaultAttributeMappingUiDefinitions() { - ArrayList<DefaultJavaAttributeMappingUiDefinition<?>> definitions = new ArrayList<DefaultJavaAttributeMappingUiDefinition<?>>(); + protected ArrayList<DefaultMappingUiDefinition> buildDefaultAttributeMappingUiDefinitions() { + ArrayList<DefaultMappingUiDefinition> definitions = new ArrayList<DefaultMappingUiDefinition>(); this.addDefaultAttributeMappingUiDefinitionsTo(definitions); return definitions; } - protected abstract void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultJavaAttributeMappingUiDefinition<?>> definitions); + protected abstract void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java index d209d6647e..c159750150 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java @@ -12,23 +12,27 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.TransientMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -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.JavaTransientMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingComposite; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.IdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingComposite; @@ -36,43 +40,45 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.JavaEmbeddedMapping2_0Composite; import org.eclipse.swt.widgets.Composite; public abstract class AbstractJavaUiFactory - implements JavaUiFactory + implements JpaUiFactory { // ********** type mappings ********** - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + @SuppressWarnings("unchecked") + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new JavaMappedSuperclassComposite((PropertyValueModel<? extends JavaMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, + @SuppressWarnings("unchecked") + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); + return new JavaEntityComposite((PropertyValueModel<? extends JavaEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, + @SuppressWarnings("unchecked") + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new JavaEmbeddableComposite((PropertyValueModel<? extends JavaEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** - public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -80,8 +86,8 @@ public abstract class AbstractJavaUiFactory return new IdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaEmbeddedIdMappingComposite( - PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -89,8 +95,8 @@ public abstract class AbstractJavaUiFactory return new EmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaBasicMappingComposite( - PropertyValueModel<JavaBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -98,8 +104,8 @@ public abstract class AbstractJavaUiFactory return new BasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaVersionMappingComposite( - PropertyValueModel<JavaVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -107,8 +113,8 @@ public abstract class AbstractJavaUiFactory return new VersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -116,8 +122,8 @@ public abstract class AbstractJavaUiFactory return new ManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -125,8 +131,8 @@ public abstract class AbstractJavaUiFactory return new OneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -134,8 +140,8 @@ public abstract class AbstractJavaUiFactory return new OneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -143,17 +149,17 @@ public abstract class AbstractJavaUiFactory return new ManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaEmbeddedMappingComposite( - PropertyValueModel<JavaEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaTransientMappingComposite( - PropertyValueModel<JavaTransientMapping> mappingModel, + public JpaComposite createTransientMappingComposite( + PropertyValueModel<? extends TransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java index 976ebb3c59..876689654e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultBasicMappingUiDefinition.java @@ -9,22 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details.java; -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.swt.widgets.Composite; public class DefaultBasicMappingUiDefinition - extends AbstractBasicMappingUiDefinition<ReadOnlyPersistentAttribute, JavaBasicMapping> - implements DefaultJavaAttributeMappingUiDefinition<JavaBasicMapping> + extends AbstractBasicMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final DefaultBasicMappingUiDefinition INSTANCE = new DefaultBasicMappingUiDefinition(); @@ -33,7 +25,7 @@ public class DefaultBasicMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<JavaBasicMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } @@ -46,7 +38,6 @@ public class DefaultBasicMappingUiDefinition } - @Override public String getKey() { return null; } @@ -55,17 +46,11 @@ public class DefaultBasicMappingUiDefinition return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } - @Override public String getLabel() { return JptUiDetailsMessages.DefaultBasicMappingUiProvider_label; } - @Override public String getLinkLabel() { return JptUiDetailsMessages.DefaultBasicMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java index 9c028885ef..d244dfef76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/DefaultEmbeddedMappingUiDefinition.java @@ -9,22 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details.java; -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.swt.widgets.Composite; public class DefaultEmbeddedMappingUiDefinition - extends AbstractEmbeddedMappingUiDefinition<ReadOnlyPersistentAttribute, JavaEmbeddedMapping> - implements DefaultJavaAttributeMappingUiDefinition<JavaEmbeddedMapping> + extends AbstractEmbeddedMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final DefaultEmbeddedMappingUiDefinition INSTANCE = new DefaultEmbeddedMappingUiDefinition(); @@ -32,7 +24,7 @@ public class DefaultEmbeddedMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<JavaEmbeddedMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } @@ -45,7 +37,6 @@ public class DefaultEmbeddedMappingUiDefinition } - @Override public String getKey() { return null; } @@ -54,17 +45,11 @@ public class DefaultEmbeddedMappingUiDefinition return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } - @Override public String getLabel() { return JptUiDetailsMessages.DefaultEmbeddedMappingUiProvider_label; } - @Override public String getLinkLabel() { return JptUiDetailsMessages.DefaultEmbeddedMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaResourceUiDefinition.java index b01899325d..98e2325d59 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/GenericJavaResourceUiDefinition.java @@ -10,13 +10,20 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; public class GenericJavaResourceUiDefinition extends AbstractJavaResourceUiDefinition @@ -40,37 +47,28 @@ public class GenericJavaResourceUiDefinition } @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new GenericJavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo( - List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - - definitions.add(JavaIdMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); } @Override - protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { + protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); definitions.add(NullJavaAttributeMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo(List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java deleted file mode 100644 index 2c0ec46eeb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaBasicMappingUiDefinition.java +++ /dev/null @@ -1,50 +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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaBasicMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaBasicMappingUiDefinition - extends AbstractBasicMappingUiDefinition<ReadOnlyPersistentAttribute, JavaBasicMapping> - implements JavaAttributeMappingUiDefinition<JavaBasicMapping> -{ - // singleton - private static final JavaBasicMappingUiDefinition INSTANCE = - new JavaBasicMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaBasicMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaBasicMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java index caa146dcab..8f8440a615 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableComposite.java @@ -13,17 +13,16 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.Embeddable; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; public class JavaEmbeddableComposite - extends Pane<Embeddable> + extends Pane<JavaEmbeddable> implements JpaComposite { public JavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, + PropertyValueModel<? extends JavaEmbeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java deleted file mode 100644 index cd63b8d656..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddableUiDefinition.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaEmbeddableUiDefinition - extends AbstractEmbeddableUiDefinition<PersistentType, JavaEmbeddable> - implements JavaTypeMappingUiDefinition<JavaEmbeddable> -{ - // singleton - private static final JavaEmbeddableUiDefinition INSTANCE = new JavaEmbeddableUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaTypeMappingUiDefinition<JavaEmbeddable> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEmbeddableUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddable> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaEmbeddableComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java deleted file mode 100644 index 0f05b99215..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingUDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaEmbeddedIdMappingUDefinition - extends AbstractEmbeddedIdMappingUiDefinition<ReadOnlyPersistentAttribute, JavaEmbeddedIdMapping> - implements JavaAttributeMappingUiDefinition<JavaEmbeddedIdMapping> -{ - // singleton - private static final JavaEmbeddedIdMappingUDefinition INSTANCE = - new JavaEmbeddedIdMappingUDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaEmbeddedIdMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEmbeddedIdMappingUDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java deleted file mode 100644 index 22cd615621..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedMappingUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaEmbeddedMappingUiDefinition - extends AbstractEmbeddedMappingUiDefinition<ReadOnlyPersistentAttribute, JavaEmbeddedMapping> - implements JavaAttributeMappingUiDefinition<JavaEmbeddedMapping> -{ - // singleton - private static final JavaEmbeddedMappingUiDefinition INSTANCE = - new JavaEmbeddedMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaEmbeddedMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEmbeddedMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java deleted file mode 100644 index 9685764f5d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEntityUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2009 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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaEntityUiDefinition - extends AbstractEntityUiDefinition<PersistentType, JavaEntity> - implements JavaTypeMappingUiDefinition<JavaEntity> -{ - // singleton - private static final JavaEntityUiDefinition INSTANCE = - new JavaEntityUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaTypeMappingUiDefinition<JavaEntity> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaEntityUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaEntity> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaEntityComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java deleted file mode 100644 index 8e0b5a7853..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingUiDefinition.java +++ /dev/null @@ -1,50 +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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractIdMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaIdMappingUiDefinition - extends AbstractIdMappingUiDefinition<ReadOnlyPersistentAttribute, JavaIdMapping> - implements JavaAttributeMappingUiDefinition<JavaIdMapping> -{ - // singleton - private static final JavaIdMappingUiDefinition INSTANCE = - new JavaIdMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaIdMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - protected JavaIdMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java deleted file mode 100644 index 741a463acd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToManyMappingUiDefinition.java +++ /dev/null @@ -1,50 +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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaManyToManyMappingUiDefinition - extends AbstractManyToManyMappingUiDefinition<ReadOnlyPersistentAttribute, JavaManyToManyMapping> - implements JavaAttributeMappingUiDefinition<JavaManyToManyMapping> -{ - // singleton - private static final JavaManyToManyMappingUiDefinition INSTANCE = - new JavaManyToManyMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaManyToManyMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaManyToManyMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java deleted file mode 100644 index 83e61d17b0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaManyToOneMappingUiDefinition.java +++ /dev/null @@ -1,50 +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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaManyToOneMappingUiDefinition - extends AbstractManyToOneMappingUiDefinition<ReadOnlyPersistentAttribute, JavaManyToOneMapping> - implements JavaAttributeMappingUiDefinition<JavaManyToOneMapping> -{ - // singleton - private static final JavaManyToOneMappingUiDefinition INSTANCE = - new JavaManyToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaManyToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaManyToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java index 6a4fa5b697..674df97239 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java @@ -35,7 +35,7 @@ import org.eclipse.swt.widgets.Composite; * -----------------------------------------------------------------------------</pre> */ public class JavaMappedSuperclassComposite - extends AbstractJavaMappedSuperclassComposite + extends AbstractJavaMappedSuperclassComposite<JavaMappedSuperclass> { public JavaMappedSuperclassComposite( PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java deleted file mode 100644 index 421e8b317a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaMappedSuperclassUiDefinition - extends AbstractMappedSuperclassUiDefinition<PersistentType, JavaMappedSuperclass> - implements JavaTypeMappingUiDefinition<JavaMappedSuperclass> -{ - // singleton - private static final JavaMappedSuperclassUiDefinition INSTANCE = - new JavaMappedSuperclassUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaTypeMappingUiDefinition<JavaMappedSuperclass> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaMappedSuperclassUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaMappedSuperclass> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaMappedSuperclassComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java deleted file mode 100644 index a92d3596b3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToManyMappingUiDefinition.java +++ /dev/null @@ -1,50 +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.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaOneToManyMappingUiDefinition - extends AbstractOneToManyMappingUiDefinition<ReadOnlyPersistentAttribute, JavaOneToManyMapping> - implements JavaAttributeMappingUiDefinition<JavaOneToManyMapping> -{ - // singleton - private static final JavaOneToManyMappingUiDefinition INSTANCE = - new JavaOneToManyMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaOneToManyMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaOneToManyMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java deleted file mode 100644 index ba1824d52f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaOneToOneMappingUiDefinition - extends AbstractOneToOneMappingUiDefinition<ReadOnlyPersistentAttribute, JavaOneToOneMapping> - implements JavaAttributeMappingUiDefinition<JavaOneToOneMapping> -{ - // singleton - private static final JavaOneToOneMappingUiDefinition INSTANCE = - new JavaOneToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaOneToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaOneToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java index a5737e92c5..0c65db93fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java @@ -51,7 +51,7 @@ public class JavaPersistentAttributeDetailsProvider && structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new JavaPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java index afd5472819..fc8f48d2e5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java @@ -52,7 +52,7 @@ public class JavaPersistentTypeDetailsProvider && structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java deleted file mode 100644 index ca4bba958d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaTransientMappingUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaTransientMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractTransientMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaTransientMappingUiDefinition - extends AbstractTransientMappingUiDefinition<ReadOnlyPersistentAttribute, JavaTransientMapping> - implements JavaAttributeMappingUiDefinition<JavaTransientMapping> -{ - // singleton - private static final JavaTransientMappingUiDefinition INSTANCE = - new JavaTransientMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaTransientMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaTransientMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaTransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaTransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java deleted file mode 100644 index c49ab4dd3d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaVersionMappingUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaVersionMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractVersionMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class JavaVersionMappingUiDefinition - extends AbstractVersionMappingUiDefinition<ReadOnlyPersistentAttribute, JavaVersionMapping> - implements JavaAttributeMappingUiDefinition<JavaVersionMapping> -{ - // singleton - private static final JavaVersionMappingUiDefinition INSTANCE = - new JavaVersionMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaVersionMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaVersionMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createJavaVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java index c5ac40b6b7..b31fe75132 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaAttributeMappingUiDefinition.java @@ -12,23 +12,21 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.MapAsComposite; import org.eclipse.swt.widgets.Composite; public class NullJavaAttributeMappingUiDefinition - extends AbstractMappingUiDefinition<ReadOnlyPersistentAttribute, JavaAttributeMapping> - implements DefaultJavaAttributeMappingUiDefinition<JavaAttributeMapping> + extends AbstractMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final NullJavaAttributeMappingUiDefinition INSTANCE = new NullJavaAttributeMappingUiDefinition(); @@ -36,7 +34,7 @@ public class NullJavaAttributeMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaAttributeMappingUiDefinition<JavaAttributeMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } @@ -77,24 +75,7 @@ public class NullJavaAttributeMappingUiDefinition return JptJpaUiImages.NULL_ATTRIBUTE_MAPPING; } - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaAttributeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager); } - - - // ********** null composite ********** - - /* CU private */ static class NullComposite - extends Pane<JavaAttributeMapping> - implements JpaComposite - { - NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { - super(mappingModel, parent, widgetFactory, resourceManager); - } - - @Override - protected void initializeLayout(Composite container) { - // NOP - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java index 686ffeb92a..57b70f4392 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/NullJavaTypeMappingUiDefinition.java @@ -13,21 +13,19 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.JptCommonUiImages; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.swt.widgets.Composite; public class NullJavaTypeMappingUiDefinition - extends AbstractMappingUiDefinition<PersistentType, JavaTypeMapping> - implements DefaultJavaTypeMappingUiDefinition<JavaTypeMapping> + extends AbstractMappingUiDefinition + implements DefaultMappingUiDefinition { // singleton private static final NullJavaTypeMappingUiDefinition INSTANCE = new NullJavaTypeMappingUiDefinition(); @@ -35,7 +33,7 @@ public class NullJavaTypeMappingUiDefinition /** * Return the singleton. */ - public static DefaultJavaTypeMappingUiDefinition<JavaTypeMapping> instance() { + public static DefaultMappingUiDefinition instance() { return INSTANCE; } @@ -76,24 +74,7 @@ public class NullJavaTypeMappingUiDefinition return JptCommonUiImages.WARNING; } - public JpaComposite buildTypeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaTypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager); } - - - // ********** null composite ********** - - /* CU private */ static class NullComposite - extends Pane<JavaTypeMapping> - implements JpaComposite - { - NullComposite(PropertyValueModel<JavaTypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - super(mappingModel, parentComposite, widgetFactory, resourceManager); - } - - @Override - protected void initializeLayout(Composite container) { - // NOP - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java index a010deaec0..7baa0e3620 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java @@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; -public abstract class AbstractOrmEmbeddableComposite - extends AbstractEmbeddableComposite<OrmEmbeddable> +public abstract class AbstractOrmEmbeddableComposite<T extends OrmEmbeddable> + extends AbstractEmbeddableComposite<T> { protected AbstractOrmEmbeddableComposite( - PropertyValueModel<? extends OrmEmbeddable> embeddableModel, + PropertyValueModel<? extends T> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java index 59d418f3c0..42ba22fcfa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityComposite; @@ -27,11 +25,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -public abstract class AbstractOrmEntityComposite - extends AbstractEntityComposite<OrmEntity> +public abstract class AbstractOrmEntityComposite<T extends OrmEntity> + extends AbstractEntityComposite<T> { protected AbstractOrmEntityComposite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends T> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -69,11 +67,11 @@ public abstract class AbstractOrmEntityComposite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, buildAccessHolder(), container); + new AccessTypeComboViewer(this, buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); // Metadata complete widgets MetadataCompleteTriStateCheckBox metadataCompleteCheckBox = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container); @@ -83,15 +81,6 @@ public abstract class AbstractOrmEntityComposite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<OrmEntity, AccessHolder>(getSubjectHolder()){ - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } @Override protected Control initializeSecondaryTablesSection(Composite container) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java index 5a65bfae99..9263df1f28 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlResourceUiDefinition.java @@ -9,97 +9,29 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details.orm; -import java.util.ArrayList; -import java.util.List; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.common.utility.internal.iterable.SuperIterableWrapper; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.TypeMapping; -import org.eclipse.jpt.jpa.ui.MappingResourceUiDefinition; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.AbstractResourceUiDefinition; -import org.eclipse.swt.widgets.Composite; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingResourceUiDefinition; /** * All the state in the definition should be "static" (i.e. unchanging once it is initialized). */ public abstract class AbstractOrmXmlResourceUiDefinition - extends AbstractResourceUiDefinition - implements MappingResourceUiDefinition + extends AbstractMappingResourceUiDefinition { - private ArrayList<OrmTypeMappingUiDefinition<? extends TypeMapping>> ormTypeMappingUiDefinitions; - - private ArrayList<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> ormAttributeMappingUiDefinitions; - - private final OrmXmlUiFactory factory; - - /** * zero-argument constructor */ protected AbstractOrmXmlResourceUiDefinition() { super(); - this.factory = this.buildOrmXmlUiFactory(); } - protected abstract OrmXmlUiFactory buildOrmXmlUiFactory(); - - // ********** type mappings ********** - public JpaComposite buildTypeMappingComposite(String mappingKey, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<TypeMapping> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, org.eclipse.jface.resource.ResourceManager resourceManager) { - OrmTypeMappingUiDefinition<TypeMapping> definition = this.getOrmTypeMappingUiDefinition(mappingKey); - return definition.buildTypeMappingComposite(this.factory, mappingModel, parentComposite, widgetFactory, resourceManager); - } - - public MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(String mappingKey) { - return this.getOrmTypeMappingUiDefinition_(mappingKey); - } - - @SuppressWarnings("unchecked") - protected OrmTypeMappingUiDefinition<TypeMapping> getOrmTypeMappingUiDefinition(String mappingKey) { - return (OrmTypeMappingUiDefinition<TypeMapping>) this.getOrmTypeMappingUiDefinition_(mappingKey); - } - - protected OrmTypeMappingUiDefinition<? extends TypeMapping> getOrmTypeMappingUiDefinition_(String mappingKey) { - for (OrmTypeMappingUiDefinition<? extends TypeMapping> definition : this.getOrmTypeMappingUiDefinitions()) { - if (ObjectTools.equals(definition.getKey(), mappingKey)) { - return definition; - } - } - throw new IllegalArgumentException("Illegal type mapping key: " + mappingKey); //$NON-NLS-1$ - } - - public Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions() { - return new SuperIterableWrapper<MappingUiDefinition<PersistentType, ? extends TypeMapping>>(this.getOrmTypeMappingUiDefinitions()); - } - - protected synchronized Iterable<OrmTypeMappingUiDefinition<? extends TypeMapping>> getOrmTypeMappingUiDefinitions() { - if (this.ormTypeMappingUiDefinitions == null) { - this.ormTypeMappingUiDefinitions = this.buildOrmTypeMappingUiDefinitions(); - } - return this.ormTypeMappingUiDefinitions; - } - - protected ArrayList<OrmTypeMappingUiDefinition<? extends TypeMapping>> buildOrmTypeMappingUiDefinitions() { - ArrayList<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions = new ArrayList<OrmTypeMappingUiDefinition<? extends TypeMapping>>(); - this.addOrmTypeMappingUiDefinitionsTo(definitions); - return definitions; - } - - protected abstract void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions); - - public DefaultMappingUiDefinition<PersistentType, ? extends TypeMapping> getDefaultTypeMappingUiDefinition() { + public DefaultMappingUiDefinition getDefaultTypeMappingUiDefinition() { //there is no way to choose an type in the orm.xml that doesn't have a specified mapping so we can return null here return null; } @@ -107,22 +39,8 @@ public abstract class AbstractOrmXmlResourceUiDefinition // ********** attribute mappings ********** - public JpaComposite buildAttributeMappingComposite(String mappingKey, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<AttributeMapping> mappingModel, org.eclipse.jpt.common.utility.model.value.PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, org.eclipse.jface.resource.ResourceManager resourceManager) { - OrmAttributeMappingUiDefinition<AttributeMapping> definition = this.getOrmAttributeMappingUiDefinition(mappingKey); - return definition.buildAttributeMappingComposite(this.factory, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(String mappingKey) { - return this.getOrmAttributeMappingUiDefinition_(mappingKey); - } - - @SuppressWarnings("unchecked") - protected OrmAttributeMappingUiDefinition<AttributeMapping> getOrmAttributeMappingUiDefinition(String mappingKey) { - return (OrmAttributeMappingUiDefinition<AttributeMapping>) this.getOrmAttributeMappingUiDefinition_(mappingKey); - } - - protected OrmAttributeMappingUiDefinition<? extends AttributeMapping> getOrmAttributeMappingUiDefinition_(String mappingKey) { - for (OrmAttributeMappingUiDefinition<? extends AttributeMapping> definition : this.getOrmAttributeMappingUiDefinitions()) { + public MappingUiDefinition getAttributeMappingUiDefinition(String mappingKey) { + for (MappingUiDefinition definition : this.getAttributeMappingUiDefinitions()) { if (ObjectTools.equals(definition.getKey(), mappingKey)) { return definition; } @@ -130,31 +48,11 @@ public abstract class AbstractOrmXmlResourceUiDefinition return this.getUnsupportedOrmAttributeMappingUiDefinition(); } - @SuppressWarnings("unchecked") - protected OrmAttributeMappingUiDefinition<? extends AttributeMapping> getUnsupportedOrmAttributeMappingUiDefinition() { + protected MappingUiDefinition getUnsupportedOrmAttributeMappingUiDefinition() { return UnsupportedOrmAttributeMappingUiDefinition.instance(); } - public Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions() { - return new SuperIterableWrapper<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>>(this.getOrmAttributeMappingUiDefinitions()); - } - - protected synchronized Iterable<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> getOrmAttributeMappingUiDefinitions() { - if (this.ormAttributeMappingUiDefinitions == null) { - this.ormAttributeMappingUiDefinitions = this.buildOrmAttributeMappingUiDefinitions(); - } - return this.ormAttributeMappingUiDefinitions; - } - - protected ArrayList<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> buildOrmAttributeMappingUiDefinitions() { - ArrayList<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions = new ArrayList<OrmAttributeMappingUiDefinition<? extends AttributeMapping>>(); - this.addOrmAttributeMappingUiDefinitionsTo(definitions); - return definitions; - } - - protected abstract void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions); - - public DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(String mappingKey) { + public DefaultMappingUiDefinition getDefaultAttributeMappingUiDefinition(String mappingKey) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java index cdac6d3fda..e7ed3fde30 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmXmlUiFactory.java @@ -12,58 +12,64 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.TransientMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -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.OrmTransientMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite; import org.eclipse.swt.widgets.Composite; public abstract class AbstractOrmXmlUiFactory - implements OrmXmlUiFactory + implements JpaUiFactory { // ********** type mappings ********** - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + @SuppressWarnings("unchecked") + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new OrmMappedSuperclassComposite((PropertyValueModel<? extends OrmMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + @SuppressWarnings("unchecked") + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); + return new OrmEntityComposite((PropertyValueModel<? extends OrmEntity>) entityModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmEmbeddableComposite( - PropertyValueModel<OrmEmbeddable> embeddableModel, + @SuppressWarnings("unchecked") + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new OrmEmbeddableComposite((PropertyValueModel<? extends OrmEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -71,8 +77,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -80,8 +86,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -89,8 +95,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -98,8 +104,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -107,8 +113,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -116,8 +122,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -125,8 +131,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -134,8 +140,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -143,8 +149,8 @@ public abstract class AbstractOrmXmlUiFactory return new OrmEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createOrmTransientMappingComposite( - PropertyValueModel<OrmTransientMapping> mappingModel, + public JpaComposite createTransientMappingComposite( + PropertyValueModel<? extends TransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java index 903af6ecda..86b0406087 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; @@ -52,7 +51,7 @@ public class EntityMappingsDetailsProvider return resourceType.equals(GenericOrmXmlDefinition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java index 89bebf4585..c448eb2de5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingComposite.java @@ -39,7 +39,7 @@ public class OrmBasicMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java deleted file mode 100644 index 0e7832b021..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmBasicMappingUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmBasicMappingUiDefinition - extends AbstractBasicMappingUiDefinition<ReadOnlyPersistentAttribute, OrmBasicMapping> - implements OrmAttributeMappingUiDefinition<OrmBasicMapping> -{ - // singleton - private static final OrmBasicMappingUiDefinition INSTANCE = - new OrmBasicMappingUiDefinition(); - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmBasicMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmBasicMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java index 1b40b478cd..0503d236f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableComposite.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; import org.eclipse.swt.widgets.Composite; public class OrmEmbeddableComposite - extends AbstractOrmEmbeddableComposite + extends AbstractOrmEmbeddableComposite<OrmEmbeddable> { public OrmEmbeddableComposite( PropertyValueModel<? extends OrmEmbeddable> embeddableModel, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java deleted file mode 100644 index 3e0e5e0299..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddableUiDefinition.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 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.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmEmbeddableUiDefinition - extends AbstractEmbeddableUiDefinition<PersistentType, OrmEmbeddable> - implements OrmTypeMappingUiDefinition<OrmEmbeddable> -{ - // singleton - private static final OrmEmbeddableUiDefinition INSTANCE = new OrmEmbeddableUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmTypeMappingUiDefinition<OrmEmbeddable> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEmbeddableUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddable> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmEmbeddableComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java deleted file mode 100644 index f02ce8885b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedIdMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmEmbeddedIdMappingUiDefinition - extends AbstractEmbeddedIdMappingUiDefinition<ReadOnlyPersistentAttribute, OrmEmbeddedIdMapping> - implements OrmAttributeMappingUiDefinition<OrmEmbeddedIdMapping> -{ - // singleton - private static final OrmEmbeddedIdMappingUiDefinition INSTANCE = - new OrmEmbeddedIdMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmEmbeddedIdMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEmbeddedIdMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java deleted file mode 100644 index fabb84f4c5..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEmbeddedMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmEmbeddedMappingUiDefinition - extends AbstractEmbeddedMappingUiDefinition<ReadOnlyPersistentAttribute, OrmEmbeddedMapping> - implements OrmAttributeMappingUiDefinition<OrmEmbeddedMapping> -{ - // singleton - private static final OrmEmbeddedMappingUiDefinition INSTANCE = - new OrmEmbeddedMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmEmbeddedMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEmbeddedMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmEmbeddedMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java index cbd7199d91..3b10668a80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityComposite.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; import org.eclipse.swt.widgets.Composite; public class OrmEntityComposite - extends AbstractOrmEntityComposite + extends AbstractOrmEntityComposite<OrmEntity> { public OrmEntityComposite( PropertyValueModel<? extends OrmEntity> entityModel, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java deleted file mode 100644 index 5f8c8d32dc..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmEntityUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 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.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmEntityUiDefinition - extends AbstractEntityUiDefinition<PersistentType, OrmEntity> - implements OrmTypeMappingUiDefinition<OrmEntity> -{ - // singleton - private static final OrmEntityUiDefinition INSTANCE = - new OrmEntityUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmTypeMappingUiDefinition<OrmEntity> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmEntityUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmEntity> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmEntityComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java index 198af36740..ea96eedd61 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingComposite.java @@ -36,7 +36,7 @@ public class OrmIdMappingComposite protected Control initializeIdSection(Composite container) { container = this.addSubPane(container, 2, 0, 0, 0, 0); - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java deleted file mode 100644 index ae67441bd6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmIdMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractIdMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmIdMappingUiDefinition - extends AbstractIdMappingUiDefinition<ReadOnlyPersistentAttribute, OrmIdMapping> - implements OrmAttributeMappingUiDefinition<OrmIdMapping> -{ - // singleton - private static final OrmIdMappingUiDefinition INSTANCE = - new OrmIdMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmIdMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmIdMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java index 7bebe22197..25083b0acc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingComposite.java @@ -12,10 +12,11 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -25,7 +26,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmManyToManyMappingComposite - extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship> + extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship, Cascade> { public OrmManyToManyMappingComposite( PropertyValueModel<? extends ManyToManyMapping> mappingModel, @@ -53,7 +54,7 @@ public class OrmManyToManyMappingComposite new FetchTypeComboViewer(this, container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java deleted file mode 100644 index f22191f414..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToManyMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmManyToManyMappingUiDefinition - extends AbstractManyToManyMappingUiDefinition<ReadOnlyPersistentAttribute, OrmManyToManyMapping> - implements OrmAttributeMappingUiDefinition<OrmManyToManyMapping> -{ - // singleton - private static final OrmManyToManyMappingUiDefinition INSTANCE = - new OrmManyToManyMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmManyToManyMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmManyToManyMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java index 1f7ea96de6..808df2977d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingComposite.java @@ -12,14 +12,13 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneRelationship; import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.swt.layout.GridData; @@ -28,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmManyToOneMappingComposite - extends AbstractManyToOneMappingComposite<OrmManyToOneMapping, OrmManyToOneRelationship> + extends AbstractManyToOneMappingComposite<ManyToOneMapping, OrmManyToOneRelationship, Cascade> { public OrmManyToOneMappingComposite( - PropertyValueModel<? extends OrmManyToOneMapping> mappingModel, + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,7 +61,7 @@ public class OrmManyToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java deleted file mode 100644 index ad41b138f8..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmManyToOneMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmManyToOneMappingUiDefinition - extends AbstractManyToOneMappingUiDefinition<ReadOnlyPersistentAttribute, OrmManyToOneMapping> - implements OrmAttributeMappingUiDefinition<OrmManyToOneMapping> -{ - // singleton - private static final OrmManyToOneMappingUiDefinition INSTANCE = - new OrmManyToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmManyToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmManyToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java index 33e2e1b782..6d92c54b73 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite; @@ -46,11 +44,11 @@ public class OrmMappedSuperclassComposite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); // Metadata complete widgets MetadataCompleteTriStateCheckBox metadataCompleteCheckBox = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container); @@ -60,13 +58,4 @@ public class OrmMappedSuperclassComposite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<OrmMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java deleted file mode 100644 index a35ed296e1..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassUiDefinition.java +++ /dev/null @@ -1,50 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2008, 2009 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.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmMappedSuperclassUiDefinition - extends AbstractMappedSuperclassUiDefinition<PersistentType, OrmMappedSuperclass> - implements OrmTypeMappingUiDefinition<OrmMappedSuperclass> -{ - // singleton - private static final OrmMappedSuperclassUiDefinition INSTANCE = - new OrmMappedSuperclassUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmTypeMappingUiDefinition<OrmMappedSuperclass> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmMappedSuperclassUiDefinition() { - super(); - } - - public JpaComposite buildTypeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmMappedSuperclass> mappingModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmMappedSuperclassComposite(mappingModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java index 022d113c83..d325a1d719 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingComposite.java @@ -12,10 +12,11 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToManyMapping; import org.eclipse.jpt.jpa.core.context.OneToManyRelationship; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; @@ -25,7 +26,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmOneToManyMappingComposite - extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship> + extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship, Cascade> { public OrmOneToManyMappingComposite( PropertyValueModel<? extends OneToManyMapping> mappingModel, @@ -53,7 +54,7 @@ public class OrmOneToManyMappingComposite new FetchTypeComboViewer(this, container); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java deleted file mode 100644 index ee93e15454..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToManyMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmOneToManyMappingUiDefinition - extends AbstractOneToManyMappingUiDefinition<ReadOnlyPersistentAttribute, OrmOneToManyMapping> - implements OrmAttributeMappingUiDefinition<OrmOneToManyMapping> -{ - // singleton - private static final OrmOneToManyMappingUiDefinition INSTANCE = - new OrmOneToManyMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmOneToManyMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmOneToManyMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java index 0e639b2a77..0cfe356434 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingComposite.java @@ -14,8 +14,9 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; +import org.eclipse.jpt.jpa.core.context.orm.OrmCascade; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.ui.internal.details.CascadePane; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.OptionalTriStateCheckBox; @@ -26,7 +27,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmOneToOneMappingComposite - extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship> + extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship, OrmCascade> { public OrmOneToOneMappingComposite( PropertyValueModel<? extends OneToOneMapping> mappingModel, @@ -60,7 +61,7 @@ public class OrmOneToOneMappingComposite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadeComposite cascadeComposite = new CascadeComposite(this, buildCascadeHolder(), container); + CascadePane cascadeComposite = new CascadePane(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadeComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java deleted file mode 100644 index ad1897df02..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmOneToOneMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmOneToOneMappingUiDefinition - extends AbstractOneToOneMappingUiDefinition<ReadOnlyPersistentAttribute, OrmOneToOneMapping> - implements OrmAttributeMappingUiDefinition<OrmOneToOneMapping> -{ - // singleton - private static final OrmOneToOneMappingUiDefinition INSTANCE = - new OrmOneToOneMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmOneToOneMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmOneToOneMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java index ae2b359b0a..f6f2542700 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java @@ -52,7 +52,7 @@ public class OrmPersistentAttributeDetailsProvider && structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new OrmPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java index 783734ee4f..36e2cbeec2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java @@ -53,7 +53,7 @@ public class OrmPersistentTypeDetailsProvider && structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java deleted file mode 100644 index f5a2ffee23..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmTransientMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractTransientMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmTransientMappingUiDefinition - extends AbstractTransientMappingUiDefinition<ReadOnlyPersistentAttribute, OrmTransientMapping> - implements OrmAttributeMappingUiDefinition<OrmTransientMapping> -{ - // singleton - private static final OrmTransientMappingUiDefinition INSTANCE = - new OrmTransientMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmTransientMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmTransientMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmTransientMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmTransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java index 041665db4d..5a2270c498 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingComposite.java @@ -36,7 +36,7 @@ public class OrmVersionMappingComposite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java deleted file mode 100644 index 336bc66a72..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmVersionMappingUiDefinition.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractVersionMappingUiDefinition; -import org.eclipse.swt.widgets.Composite; - -public class OrmVersionMappingUiDefinition - extends AbstractVersionMappingUiDefinition<ReadOnlyPersistentAttribute, OrmVersionMapping> - implements OrmAttributeMappingUiDefinition<OrmVersionMapping> -{ - // singleton - private static final OrmVersionMappingUiDefinition INSTANCE = - new OrmVersionMappingUiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmVersionMapping> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmVersionMappingUiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return factory.createOrmVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java index ec317cabf5..d554d24360 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java @@ -13,13 +13,20 @@ import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.internal.jface.SimpleItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.structure.OrmStructureItemContentProviderFactory; import org.eclipse.jpt.jpa.ui.internal.structure.OrmStructureItemLabelProviderFactory; @@ -47,7 +54,7 @@ public class OrmXmlUiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new GenericOrmXmlUiFactory(); } @@ -66,27 +73,16 @@ public class OrmXmlUiDefinition ); @Override - protected void addOrmAttributeMappingUiDefinitionsTo( - List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo( - List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java index cdf509a705..31a774764a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/UnsupportedOrmAttributeMappingUiDefinition.java @@ -11,26 +11,24 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; import org.eclipse.swt.widgets.Composite; public class UnsupportedOrmAttributeMappingUiDefinition extends AbstractMappingUiDefinition - implements OrmAttributeMappingUiDefinition { // singleton - private static final OrmAttributeMappingUiDefinition INSTANCE = new UnsupportedOrmAttributeMappingUiDefinition(); + private static final MappingUiDefinition INSTANCE = new UnsupportedOrmAttributeMappingUiDefinition(); /** * Return the singleton. */ - public static OrmAttributeMappingUiDefinition instance() { + public static MappingUiDefinition instance() { return INSTANCE; } @@ -54,20 +52,7 @@ public class UnsupportedOrmAttributeMappingUiDefinition return JptUiDetailsOrmMessages.UnsupportedOrmMappingUiProvider_linkLabel; } - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel mappingModel, PropertyValueModel enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new NullComposite(mappingModel, parentComposite, widgetFactory, resourceManager); } - - public static class NullComposite - extends Pane<JavaAttributeMapping> - implements JpaComposite - { - NullComposite(PropertyValueModel<JavaAttributeMapping> mappingModel, Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { - super(mappingModel, parent, widgetFactory, resourceManager); - } - @Override - protected void initializeLayout(Composite container) { - // NOP - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java index e6c1a1fe6e..5a365e654d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java @@ -20,9 +20,7 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.iterator.FilteringIterator; -import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.orm.OrmReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; @@ -82,14 +80,8 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog public Object[] getElements(Object inputElement) { return ArrayTools.array( - IteratorTools.sort( - new FilteringIterator<MappingUiDefinition<ReadOnlyPersistentAttribute, ?>>( - ((JpaPlatformUi) inputElement).getAttributeMappingUiDefinitions(unmappedPersistentAttribute.getResourceType())) { - @Override - protected boolean accept(MappingUiDefinition<ReadOnlyPersistentAttribute, ?> o) { - return o.isEnabledFor(AddPersistentAttributeToXmlAndMapDialog.this.unmappedPersistentAttribute); - } - }, + IterableTools.sort( + ((JpaPlatformUi) inputElement).getAttributeMappingUiDefinitions(unmappedPersistentAttribute), getProvidersComparator())); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentClassDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentClassDialog.java index 8e4133aab6..1a1723f0b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentClassDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/dialogs/AddPersistentClassDialog.java @@ -31,15 +31,14 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; +import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -115,17 +114,21 @@ public class AddPersistentClassDialog extends StatusDialog this.mappingCombo = new ComboViewer(createCombo(composite, 2)); this.mappingCombo.setContentProvider( new IStructuredContentProvider() { - public void dispose() {} + public void dispose() { + //nothing to dispose + } public Object[] getElements(Object inputElement) { - return new Object[] { - OrmMappedSuperclassUiDefinition.instance(), - OrmEntityUiDefinition.instance(), - OrmEmbeddableUiDefinition.instance() - }; + return ArrayTools.array(getTypeMappingUiDefinitions((EntityMappings) inputElement)); + } + + protected Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(EntityMappings entityMappings) { + return getJpaPlatformUi().getTypeMappingUiDefinitions(entityMappings.getResourceType()); + } + + public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { + //NOP } - - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {} }); this.mappingCombo.setLabelProvider( new LabelProvider() { @@ -139,8 +142,9 @@ public class AddPersistentClassDialog extends StatusDialog validate(); } }); - this.mappingCombo.setInput("FOO"); - this.mappingCombo.getCombo().select(1); // select Entity to begin + this.mappingCombo.setInput(this.entityMappings); + //TODO maybe use JpaPlatformUi.getDefaultTypeMappingDefintion() to do this? currently that returns null for orm.xml + this.mappingCombo.getCombo().select(0); // select Entity to begin // TODO - F1 Help // PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IDaliHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE); @@ -212,6 +216,10 @@ public class AddPersistentClassDialog extends StatusDialog combo.setLayoutData(gd); return combo; } + + protected JpaPlatformUi getJpaPlatformUi() { + return (JpaPlatformUi) this.entityMappings.getJpaPlatform().getAdapter(JpaPlatformUi.class); + } private JpaProject getJpaProject() { return this.entityMappings.getJpaProject(); @@ -296,6 +304,6 @@ public class AddPersistentClassDialog extends StatusDialog public OrmPersistentType openAndReturnType() { super.open(); - return addedType; + return this.addedType; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java index e7815706dc..2cbd6ec574 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/GenericOrmXml2_0UiFactory.java @@ -12,20 +12,26 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; -import org.eclipse.jpt.jpa.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmOneToOneMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmTransientMapping; -import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.context.BasicMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.context.VersionMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.IdMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmEntity2_0; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlUiFactory; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmBasicMapping2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmElementCollectionMapping2_0Composite; @@ -38,50 +44,53 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmManyToOneMapping2_0Co import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmOneToManyMapping2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmOneToOneMapping2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmVersionMapping2_0Composite; -import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0; +import org.eclipse.jpt.jpa.ui.jpa2.details.JpaUiFactory2_0; import org.eclipse.swt.widgets.Composite; public class GenericOrmXml2_0UiFactory extends AbstractOrmXmlUiFactory - implements OrmXmlUiFactory2_0 + implements JpaUiFactory2_0 { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new OrmEntity2_0Composite((PropertyValueModel<? extends OrmEntity2_0>) entityModel, parentComposite, widgetFactory, resourceManager); } // **************** attribute mappings *********************** + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmIdMapping2_0Composite((PropertyValueModel<? extends IdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEmbeddedIdMapping2_0Composite((PropertyValueModel<? extends EmbeddedIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> mappingModel, + public JpaComposite createBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -90,8 +99,8 @@ public class GenericOrmXml2_0UiFactory } @Override - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> mappingModel, + public JpaComposite createVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -99,68 +108,63 @@ public class GenericOrmXml2_0UiFactory return new OrmVersionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmManyToOneMapping2_0Composite((PropertyValueModel<? extends ManyToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmOneToManyMapping2_0Composite((PropertyValueModel<? extends OneToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmOneToOneMapping2_0Composite((PropertyValueModel<? extends OneToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmManyToManyMapping2_0Composite((PropertyValueModel<? extends ManyToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OrmEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new OrmEmbeddedMapping2_0Composite((PropertyValueModel<? extends EmbeddedMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - @Override - public JpaComposite createOrmTransientMappingComposite( - PropertyValueModel<OrmTransientMapping> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager) { - return new TransientMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } - - public JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, + public JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java index d04264f6f9..b2b900ea00 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropert import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.transformer.Transformer; +import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.core.context.CollectionMapping; @@ -94,7 +95,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele new FetchTypeComboViewer(this, container); // Collection table widgets - CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableHolder(), container); + CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; collectionTableComposite.getControl().setLayoutData(gridData); @@ -158,7 +159,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele protected Control buildBasicValueSection(Composite container) { Composite basicComposite = addSubPane(container); - new ColumnComposite(this, buildValueColumnHolder(), basicComposite); + new ColumnComposite(this, buildValueColumnModel(), basicComposite); // type section final Section section = this.getWidgetFactory().createSection(basicComposite, ExpandableComposite.TWISTIE); @@ -240,8 +241,8 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele ); } - protected PropertyValueModel<ElementCollectionMapping2_0.Type> buildValueHolder() { - return new PropertyAspectAdapter<T, ElementCollectionMapping2_0.Type>( + protected PropertyValueModel<T.Type> buildValueHolder() { + return new PropertyAspectAdapter<T, T.Type>( this.getSubjectHolder(), CollectionMapping.VALUE_TYPE_PROPERTY) { @Override protected ElementCollectionMapping2_0.Type buildValue_() { @@ -250,9 +251,9 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele }; } - private Transformer<ElementCollectionMapping2_0.Type, Control> buildPaneTransformer(final Composite container) { - return new Transformer<ElementCollectionMapping2_0.Type, Control>() { - public Control transform(ElementCollectionMapping2_0.Type type) { + private Transformer<T.Type, Control> buildPaneTransformer(final Composite container) { + return new Transformer<T.Type, Control>() { + public Control transform(T.Type type) { return AbstractElementCollectionMapping2_0Composite.this.transformValueType(type, container); } }; @@ -261,7 +262,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele /** * Given the selected override, return the control that will be displayed */ - protected Control transformValueType(ElementCollectionMapping2_0.Type type, Composite container) { + protected Control transformValueType(T.Type type, Composite container) { if (type == null) { return null; } @@ -275,8 +276,8 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele } } - protected PropertyValueModel<CollectionTable2_0> buildCollectionTableHolder() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, CollectionTable2_0>(getSubjectHolder()) { + protected PropertyValueModel<CollectionTable2_0> buildCollectionTableModel() { + return new PropertyAspectAdapter<T, CollectionTable2_0>(getSubjectHolder()) { @Override protected CollectionTable2_0 buildValue_() { return this.subject.getCollectionTable(); @@ -284,7 +285,7 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele }; } - protected PropertyValueModel<Column> buildValueColumnHolder() { + protected PropertyValueModel<Column> buildValueColumnModel() { return new PropertyAspectAdapter<ElementCollectionMapping2_0, Column>(getSubjectHolder()) { @Override protected Column buildValue_() { @@ -386,8 +387,13 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele } }; } - protected Composite addPane(Composite container, int groupBoxMargin) { - return addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin); - } + protected PropertyValueModel<AccessHolder> buildAccessReferenceModel() { + return new PropertyAspectAdapter<T, AccessHolder>(getSubjectHolder()) { + @Override + protected AccessHolder buildValue_() { + return this.subject.getPersistentAttribute(); + } + }; + } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java deleted file mode 100644 index 97b46d1c65..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0UiDefinition.java +++ /dev/null @@ -1,41 +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.ui.internal.jpa2.details; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.ui.JptJpaUiImages; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; - -public abstract class AbstractElementCollectionMapping2_0UiDefinition<M, T extends ElementCollectionMapping2_0> - extends AbstractMappingUiDefinition<M, T> -{ - protected AbstractElementCollectionMapping2_0UiDefinition() { - super(); - } - - public String getKey() { - return MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY; - } - - public String getLabel() { - return JptUiDetailsMessages2_0.ElementCollectionMapping2_0_label; - } - - public String getLinkLabel() { - return JptUiDetailsMessages2_0.ElementCollectionMapping2_0_linkLabel; - } - - @Override - public ImageDescriptor getImageDescriptor() { - return JptJpaUiImages.ELEMENT_COLLECTION; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java index 94984a5341..322fa810f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMapping2_0Composite.java @@ -13,15 +13,15 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToOneMappingComposite; import org.eclipse.swt.widgets.Composite; -public abstract class AbstractManyToOneMapping2_0Composite<T extends ManyToOneMapping, R extends ManyToOneRelationship2_0> - extends AbstractManyToOneMappingComposite<T, R> +public abstract class AbstractManyToOneMapping2_0Composite<T extends ManyToOneMapping2_0, R extends ManyToOneRelationship2_0, C extends Cascade2_0> + extends AbstractManyToOneMappingComposite<T, R, C> { protected AbstractManyToOneMapping2_0Composite( PropertyValueModel<? extends T> mappingModel, @@ -40,19 +40,19 @@ public abstract class AbstractManyToOneMapping2_0Composite<T extends ManyToOneMa } protected void initializeDerivedIdentityCollapsibleSection(Composite container) { - new DerivedIdentity2_0Pane(this, buildDerivedIdentityHolder(), container); + new DerivedIdentity2_0Pane(this, buildDerivedIdentityModel(), container); } @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new ManyToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); + new ManyToOneJoiningStrategy2_0Pane(this, buildRelationshipModel(), container); } - protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityHolder() { + protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityModel() { return new PropertyAspectAdapter<T, DerivedIdentity2_0>(getSubjectHolder()) { @Override protected DerivedIdentity2_0 buildValue_() { - return ((ManyToOneMapping2_0) this.subject).getDerivedIdentity(); + return this.subject.getDerivedIdentity(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java index 850468be72..2c8c088fdb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMapping2_0Composite.java @@ -13,15 +13,16 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToOneMappingComposite; import org.eclipse.swt.widgets.Composite; -public abstract class AbstractOneToOneMapping2_0Composite<T extends OneToOneMapping, R extends OneToOneRelationship2_0> - extends AbstractOneToOneMappingComposite<T, R> +public abstract class AbstractOneToOneMapping2_0Composite<T extends OneToOneMapping2_0, R extends OneToOneRelationship2_0, C extends Cascade2_0> + extends AbstractOneToOneMappingComposite<T, R, C> { protected AbstractOneToOneMapping2_0Composite( PropertyValueModel<? extends T> mappingModel, @@ -40,14 +41,23 @@ public abstract class AbstractOneToOneMapping2_0Composite<T extends OneToOneMapp } protected void initializeDerivedIdentityCollapsibleSection(Composite container) { - new DerivedIdentity2_0Pane(this, buildDerivedIdentityHolder(), container); + new DerivedIdentity2_0Pane(this, buildDerivedIdentityModel(), container); } - protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityHolder() { + protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityModel() { return new PropertyAspectAdapter<T, DerivedIdentity2_0>(getSubjectHolder()) { @Override protected DerivedIdentity2_0 buildValue_() { - return ((OneToOneMapping2_0) this.subject).getDerivedIdentity(); + return this.subject.getDerivedIdentity(); + } + }; + } + + protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { + return new PropertyAspectAdapter<T, OrphanRemovable2_0>(getSubjectHolder()) { + @Override + protected OrphanRemovable2_0 buildValue_() { + return this.subject.getOrphanRemoval(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java index 1f563e79e7..b65291267b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java @@ -13,19 +13,19 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.Cascade; -import org.eclipse.jpt.jpa.core.context.RelationshipMapping; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; -import org.eclipse.jpt.jpa.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.jpa.core.jpa2.context.RelationshipMapping2_0; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractCascadePane; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.swt.widgets.Composite; + public class CascadePane2_0 - extends CascadeComposite + extends AbstractCascadePane<Cascade2_0> { public CascadePane2_0( - Pane<? extends RelationshipMapping> parentPane, - PropertyValueModel<? extends Cascade> cascadeModel, + Pane<? extends RelationshipMapping2_0> parentPane, + PropertyValueModel<? extends Cascade2_0> cascadeModel, Composite parent ) { super(parentPane, cascadeModel, parent); @@ -54,20 +54,20 @@ public class CascadePane2_0 addCheckBox( container, JptUiDetailsMessages2_0.CascadePane2_0_detach, - buildCascadeTypeDetachHolder(), + buildCascadeTypeDetachModel(), null); } - protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeDetachHolder() { - return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade2_0.DETACH_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeDetachModel() { + return new PropertyAspectAdapter<Cascade2_0, Boolean>(getSubjectHolder(), Cascade2_0.DETACH_PROPERTY) { @Override protected Boolean buildValue_() { - return Boolean.valueOf(((Cascade2_0) this.subject).isDetach()); + return Boolean.valueOf(this.subject.isDetach()); } @Override protected void setValue_(Boolean value) { - ((Cascade2_0) this.subject).setDetach(value.booleanValue()); + this.subject.setDetach(value.booleanValue()); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java index 7eefb8bf56..b1ebecc723 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0Composite.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.swt.widgets.Composite; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0UiDefinition.java new file mode 100644 index 0000000000..da2e8b437c --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionMapping2_0UiDefinition.java @@ -0,0 +1,71 @@ +/******************************************************************************* + * 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.ui.internal.jpa2.details; + +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ResourceManager; +import org.eclipse.jpt.common.ui.WidgetFactory; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; +import org.eclipse.jpt.jpa.core.jpa2.MappingKeys2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; +import org.eclipse.jpt.jpa.ui.details.JpaComposite; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.jpa2.details.JpaUiFactory2_0; +import org.eclipse.swt.widgets.Composite; + +public class ElementCollectionMapping2_0UiDefinition + extends AbstractMappingUiDefinition +{ + // singleton + private static final ElementCollectionMapping2_0UiDefinition INSTANCE = + new ElementCollectionMapping2_0UiDefinition(); + + + /** + * Return the singleton. + */ + public static MappingUiDefinition instance() { + return INSTANCE; + } + + + /** + * Ensure single instance. + */ + private ElementCollectionMapping2_0UiDefinition() { + super(); + } + + public String getKey() { + return MappingKeys2_0.ELEMENT_COLLECTION_ATTRIBUTE_MAPPING_KEY; + } + + public String getLabel() { + return JptUiDetailsMessages2_0.ElementCollectionMapping2_0_label; + } + + public String getLinkLabel() { + return JptUiDetailsMessages2_0.ElementCollectionMapping2_0_linkLabel; + } + + @Override + public ImageDescriptor getImageDescriptor() { + return JptJpaUiImages.ELEMENT_COLLECTION; + } + + @SuppressWarnings("unchecked") + public JpaComposite buildMappingComposite(JpaUiFactory factory, PropertyValueModel<? extends JpaContextNode> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return ((JpaUiFactory2_0) factory).createElementCollectionMapping2_0Composite((PropertyValueModel<ElementCollectionMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java index 07725d7367..e77ef0ebba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0Composite.java @@ -12,17 +12,17 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingOverridesComposite; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class EmbeddedIdMapping2_0Composite - extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping> + extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping2_0> { public EmbeddedIdMapping2_0Composite( - PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, + PropertyValueModel<? extends EmbeddedIdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0MappedByRelationshipPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0MappedByRelationshipPane.java index 429ab648d9..dd4cf17f80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0MappedByRelationshipPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMapping2_0MappedByRelationshipPane.java @@ -24,17 +24,17 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.part.PageBook; -public class EmbeddedIdMapping2_0MappedByRelationshipPane<T extends EmbeddedIdMapping2_0> - extends Pane<T> +public class EmbeddedIdMapping2_0MappedByRelationshipPane + extends Pane<EmbeddedIdMapping2_0> { Label mappedByRelationshipLabel; public EmbeddedIdMapping2_0MappedByRelationshipPane( Pane<?> parentPane, - PropertyValueModel<T> subjectHolder, + PropertyValueModel<? extends EmbeddedIdMapping2_0> subjectModel, Composite parent) { - super(parentPane, subjectHolder, parent); + super(parentPane, subjectModel, parent); } @Override @@ -53,7 +53,7 @@ public class EmbeddedIdMapping2_0MappedByRelationshipPane<T extends EmbeddedIdMa } protected ModifiablePropertyValueModel<Boolean> buildDerivedModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { + return new PropertyAspectAdapter<EmbeddedIdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isDerived()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMapping2_0OverridesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMapping2_0OverridesComposite.java index 7fa55fae3e..0e92a32cc2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMapping2_0OverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMapping2_0OverridesComposite.java @@ -14,7 +14,6 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; -import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingOverridesComposite; @@ -22,10 +21,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.part.PageBook; public class EmbeddedMapping2_0OverridesComposite - extends AbstractEmbeddedMappingOverridesComposite<EmbeddedMapping> + extends AbstractEmbeddedMappingOverridesComposite<EmbeddedMapping2_0> { public EmbeddedMapping2_0OverridesComposite( - Pane<? extends EmbeddedMapping> parentPane, + Pane<? extends EmbeddedMapping2_0> parentPane, Composite parent) { super(parentPane, parent); @@ -39,7 +38,7 @@ public class EmbeddedMapping2_0OverridesComposite @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerHolder() { - return new PropertyAspectAdapter<EmbeddedMapping, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<EmbeddedMapping2_0, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getAttributeOverrideContainer(); @@ -54,10 +53,10 @@ public class EmbeddedMapping2_0OverridesComposite @Override protected PropertyValueModel<AssociationOverrideContainer> buildAssociationOverrideContainerHolder() { - return new PropertyAspectAdapter<EmbeddedMapping, AssociationOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapter<EmbeddedMapping2_0, AssociationOverrideContainer>(getSubjectHolder()) { @Override protected AssociationOverrideContainer buildValue_() { - return ((EmbeddedMapping2_0) this.subject).getAssociationOverrideContainer(); + return this.subject.getAssociationOverrideContainer(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMapping2_0MappedByRelationshipPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMapping2_0MappedByRelationshipPane.java index bce6aea311..e16b40378a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMapping2_0MappedByRelationshipPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMapping2_0MappedByRelationshipPane.java @@ -25,15 +25,15 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.part.PageBook; -public class IdMapping2_0MappedByRelationshipPane<T extends IdMapping2_0> - extends Pane<T> +public class IdMapping2_0MappedByRelationshipPane + extends Pane<IdMapping2_0> { Label mappedByRelationshipLabel; public IdMapping2_0MappedByRelationshipPane( Pane<?> parentPane, - PropertyValueModel<T> subjectHolder, + PropertyValueModel<? extends IdMapping2_0> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -55,7 +55,7 @@ public class IdMapping2_0MappedByRelationshipPane<T extends IdMapping2_0> } protected ModifiablePropertyValueModel<Boolean> buildDerivedModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { + return new PropertyAspectAdapter<IdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isDerived()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java index 12910557e0..3d610a5539 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/Ordering2_0Composite.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.CollectionMapping; -import org.eclipse.jpt.jpa.core.context.Orderable; +import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0; import org.eclipse.jpt.jpa.core.jpa2.context.Orderable2_0; import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds; @@ -48,15 +48,15 @@ import org.eclipse.swt.widgets.Text; * @see OrmOneToManyMappingComposite */ public class Ordering2_0Composite - extends AbstractOrderingComposite + extends AbstractOrderingComposite<Orderable2_0> { - public Ordering2_0Composite(Pane<? extends CollectionMapping> parentPane, Composite parentComposite) { + public Ordering2_0Composite(Pane<? extends CollectionMapping2_0> parentPane, Composite parentComposite) { super(parentPane, parentComposite); } @Override protected void initializeLayout(Composite container) { - PropertyValueModel<Orderable> orderableHolder = buildOrderableHolder(); + PropertyValueModel<Orderable2_0> orderableHolder = buildOrderableModel(); // No Ordering radio button addRadioButton( @@ -113,29 +113,29 @@ public class Ordering2_0Composite } - private PropertyValueModel<Boolean> buildPaneEnablerHolder(PropertyValueModel<Orderable> orderableHolder) { + private PropertyValueModel<Boolean> buildPaneEnablerHolder(PropertyValueModel<Orderable2_0> orderableHolder) { return buildOrderColumnOrderingHolder(orderableHolder); } - protected ModifiablePropertyValueModel<Boolean> buildOrderColumnOrderingHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, Boolean>(orderableHolder, Orderable2_0.ORDER_COLUMN_ORDERING_PROPERTY) { + protected ModifiablePropertyValueModel<Boolean> buildOrderColumnOrderingHolder(PropertyValueModel<Orderable2_0> orderableHolder) { + return new PropertyAspectAdapter<Orderable2_0, Boolean>(orderableHolder, Orderable2_0.ORDER_COLUMN_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { - return Boolean.valueOf(((Orderable2_0) this.subject).isOrderColumnOrdering()); + return Boolean.valueOf(this.subject.isOrderColumnOrdering()); } @Override protected void setValue_(Boolean value) { - ((Orderable2_0) this.subject).setOrderColumnOrdering(value.booleanValue()); + this.subject.setOrderColumnOrdering(value.booleanValue()); } }; } - protected PropertyValueModel<OrderColumn2_0> buildOrderColumnHolder(PropertyValueModel<Orderable> orderableHolder) { - return new PropertyAspectAdapter<Orderable, OrderColumn2_0>(orderableHolder) { + protected PropertyValueModel<OrderColumn2_0> buildOrderColumnHolder(PropertyValueModel<Orderable2_0> orderableHolder) { + return new PropertyAspectAdapter<Orderable2_0, OrderColumn2_0>(orderableHolder) { @Override protected OrderColumn2_0 buildValue_() { - return ((Orderable2_0) this.subject).getOrderColumn(); + return this.subject.getOrderColumn(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaResourceUiDefinition.java index 6d7da67e92..dcdf4ba446 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaResourceUiDefinition.java @@ -10,30 +10,25 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import java.util.List; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.DefaultJavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultBasicMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.DefaultEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedIdMappingUDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.java.NullJavaAttributeMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class Generic2_0JavaResourceUiDefinition extends AbstractJavaResourceUiDefinition @@ -57,36 +52,29 @@ public class Generic2_0JavaResourceUiDefinition } @Override - protected JavaUiFactory buildJavaUiFactory() { + protected JpaUiFactory buildUiFactory() { return new Generic2_0JavaUiFactory(); } @Override - protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<JavaAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(JavaElementCollectionMapping2_0UiDefinition.instance()); - definitions.add(JavaIdMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedIdMappingUDefinition.instance()); - definitions.add(JavaBasicMappingUiDefinition.instance()); - definitions.add(JavaVersionMappingUiDefinition.instance()); - definitions.add(JavaManyToOneMappingUiDefinition.instance()); - definitions.add(JavaOneToManyMappingUiDefinition.instance()); - definitions.add(JavaOneToOneMappingUiDefinition.instance()); - definitions.add(JavaManyToManyMappingUiDefinition.instance()); - definitions.add(JavaEmbeddedMappingUiDefinition.instance()); - definitions.add(JavaTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); } @Override - protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultJavaAttributeMappingUiDefinition<?>> definitions) { + protected void addDefaultAttributeMappingUiDefinitionsTo(List<DefaultMappingUiDefinition> definitions) { definitions.add(DefaultBasicMappingUiDefinition.instance()); definitions.add(DefaultEmbeddedMappingUiDefinition.instance()); definitions.add(NullJavaAttributeMappingUiDefinition.instance()); } - - @Override - protected void addSpecifiedTypeMappingUiDefinitionsTo(List<JavaTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(JavaEntityUiDefinition.instance()); - definitions.add(JavaMappedSuperclassUiDefinition.instance()); - definitions.add(JavaEmbeddableUiDefinition.instance()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java index d43fb82aa5..ca661175c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/Generic2_0JavaUiFactory.java @@ -12,132 +12,152 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.Embeddable; +import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.context.Entity; +import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; +import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.context.MappedSuperclass; +import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.context.OneToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; -import org.eclipse.jpt.jpa.core.context.java.JavaIdMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.IdMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEntity2_0; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaUiFactory; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedIdMapping2_0Composite; -import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0; +import org.eclipse.jpt.jpa.ui.jpa2.details.JpaUiFactory2_0; import org.eclipse.swt.widgets.Composite; public class Generic2_0JavaUiFactory extends AbstractJavaUiFactory - implements JavaUiFactory2_0 + implements JpaUiFactory2_0 { // ********** type mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + public JpaComposite createMappedSuperclassComposite( + PropertyValueModel<? extends MappedSuperclass> mappedSuperclassModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + return new JavaMappedSuperclass2_0Composite((PropertyValueModel<? extends JavaMappedSuperclass>) mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> entityModel, + public JpaComposite createEntityComposite( + PropertyValueModel<? extends Entity> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); + return new JavaEntity2_0Composite((PropertyValueModel<? extends JavaEntity2_0>) entityModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> embeddableModel, + public JpaComposite createEmbeddableComposite( + PropertyValueModel<? extends Embeddable> embeddableModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEmbeddable2_0Composite(embeddableModel, parentComposite, widgetFactory, resourceManager); + return new JavaEmbeddable2_0Composite((PropertyValueModel<? extends JavaEmbeddable>) embeddableModel, parentComposite, widgetFactory, resourceManager); } // ********** attribute mappings ********** + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> mappingModel, + public JpaComposite createIdMappingComposite( + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaIdMapping2_0Composite((PropertyValueModel<? extends IdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddedIdMappingComposite( - PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, + public JpaComposite createEmbeddedIdMappingComposite( + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new EmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new EmbeddedIdMapping2_0Composite((PropertyValueModel<? extends EmbeddedIdMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaEmbeddedMappingComposite( - PropertyValueModel<JavaEmbeddedMapping> mappingModel, + public JpaComposite createEmbeddedMappingComposite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaEmbeddedMapping2_0Composite((PropertyValueModel<? extends EmbeddedMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> mappingModel, + public JpaComposite createManyToManyMappingComposite( + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaManyToManyMapping2_0Composite((PropertyValueModel<? extends ManyToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> mappingModel, + public JpaComposite createManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaManyToOneMapping2_0Composite((PropertyValueModel<? extends ManyToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> mappingModel, + public JpaComposite createOneToManyMappingComposite( + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaOneToManyMapping2_0Composite((PropertyValueModel<? extends OneToManyMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } + @SuppressWarnings("unchecked") @Override - public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> mappingModel, + public JpaComposite createOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new JavaOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaOneToOneMapping2_0Composite((PropertyValueModel<? extends OneToOneMapping2_0>) mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public JpaComposite createJavaElementCollectionMapping2_0Composite( - PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, + public JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java deleted file mode 100644 index aa14677b15..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaElementCollectionMapping2_0UiDefinition.java +++ /dev/null @@ -1,51 +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.ui.internal.jpa2.details.java; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.AbstractElementCollectionMapping2_0UiDefinition; -import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0; -import org.eclipse.swt.widgets.Composite; - -public class JavaElementCollectionMapping2_0UiDefinition - extends AbstractElementCollectionMapping2_0UiDefinition<ReadOnlyPersistentAttribute, JavaElementCollectionMapping2_0> - implements JavaAttributeMappingUiDefinition<JavaElementCollectionMapping2_0> -{ - // singleton - private static final JavaElementCollectionMapping2_0UiDefinition INSTANCE = - new JavaElementCollectionMapping2_0UiDefinition(); - - - /** - * Return the singleton. - */ - public static JavaAttributeMappingUiDefinition<JavaElementCollectionMapping2_0> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private JavaElementCollectionMapping2_0UiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return ((JavaUiFactory2_0) factory).createJavaElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java index c60f49b71a..4b33d73a75 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEmbeddedMapping2_0Composite.java @@ -12,17 +12,17 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedMapping2_0OverridesComposite; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class JavaEmbeddedMapping2_0Composite - extends AbstractEmbeddedMappingComposite<JavaEmbeddedMapping> + extends AbstractEmbeddedMappingComposite<EmbeddedMapping2_0> { public JavaEmbeddedMapping2_0Composite( - PropertyValueModel<? extends JavaEmbeddedMapping> mappingModel, + PropertyValueModel<? extends EmbeddedMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java index fe1f79b8ae..fe66eb4273 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntity2_0Composite.java @@ -13,10 +13,8 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.java.JavaEntity; 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.JavaEntity2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -35,10 +33,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaEntity2_0Composite - extends AbstractEntityComposite<JavaEntity> + extends AbstractEntityComposite<JavaEntity2_0> { public JavaEntity2_0Composite( - PropertyValueModel<? extends JavaEntity> entityModel, + PropertyValueModel<? extends JavaEntity2_0> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -61,14 +59,14 @@ public class JavaEntity2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, buildAccessHolder(), container); + new AccessTypeComboViewer(this, buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); // Cacheable widgets - Cacheable2_0TriStateCheckBox cacheableCheckBox = new Cacheable2_0TriStateCheckBox(this, buildCacheableHolder(), container); + Cacheable2_0TriStateCheckBox cacheableCheckBox = new Cacheable2_0TriStateCheckBox(this, buildCacheableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cacheableCheckBox.getControl().setLayoutData(gridData); @@ -76,20 +74,11 @@ public class JavaEntity2_0Composite return container; } - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaEntity, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } - - protected PropertyValueModel<Cacheable2_0> buildCacheableHolder() { - return new PropertyAspectAdapter<JavaEntity, Cacheable2_0>(getSubjectHolder()) { + protected PropertyValueModel<Cacheable2_0> buildCacheableModel() { + return new PropertyAspectAdapter<JavaEntity2_0, Cacheable2_0>(getSubjectHolder()) { @Override protected Cacheable2_0 buildValue_() { - return ((CacheableHolder2_0) this.subject).getCacheable(); + return this.subject.getCacheable(); } }; } @@ -111,6 +100,6 @@ public class JavaEntity2_0Composite @Override protected Control initializeQueriesSection(Composite container) { - return new Queries2_0Composite(this, this.buildQueryContainerHolder(), container).getControl(); + return new Queries2_0Composite(this, this.buildQueryContainerModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java index 70ad519e10..8a52e1008c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaIdMapping2_0Composite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.IdMapping2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractIdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.IdMapping2_0MappedByRelationshipPane; @@ -21,10 +21,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class JavaIdMapping2_0Composite - extends AbstractIdMappingComposite<IdMapping> + extends AbstractIdMappingComposite<IdMapping2_0> { public JavaIdMapping2_0Composite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends IdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -38,7 +38,7 @@ public class JavaIdMapping2_0Composite container = this.addSubPane(container); new IdMapping2_0MappedByRelationshipPane(this, getSubjectHolder(), container); - new ColumnComposite(this, buildColumnHolder(), container); + new ColumnComposite(this, buildColumnModel(), container); return container; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java index 9d1824c671..d2e93b27f5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToManyMapping2_0Composite.java @@ -12,8 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyMapping; import org.eclipse.jpt.jpa.core.context.java.JavaManyToManyRelationship; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; @@ -26,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaManyToManyMapping2_0Composite - extends AbstractManyToManyMappingComposite<JavaManyToManyMapping, JavaManyToManyRelationship> + extends AbstractManyToManyMappingComposite<ManyToManyMapping2_0, JavaManyToManyRelationship, Cascade2_0> { public JavaManyToManyMapping2_0Composite( - PropertyValueModel<? extends JavaManyToManyMapping> mappingModel, + PropertyValueModel<? extends ManyToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -51,7 +52,7 @@ public class JavaManyToManyMapping2_0Composite new FetchTypeComboViewer(this, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java index 153eb53030..9c688176ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaManyToOneMapping2_0Composite.java @@ -12,7 +12,8 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToOneRelationship2_0; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; @@ -26,10 +27,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaManyToOneMapping2_0Composite - extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationship2_0> + extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping2_0, JavaManyToOneRelationship2_0, Cascade2_0> { public JavaManyToOneMapping2_0Composite( - PropertyValueModel<? extends JavaManyToOneMapping> mappingModel, + PropertyValueModel<? extends ManyToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -57,7 +58,7 @@ public class JavaManyToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java index 1fe0139815..0d662799ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractJavaMappedSuperclassComposite; @@ -49,7 +47,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * -----------------------------------------------------------------------------</pre> */ public class JavaMappedSuperclass2_0Composite - extends AbstractJavaMappedSuperclassComposite + extends AbstractJavaMappedSuperclassComposite<JavaMappedSuperclass> { public JavaMappedSuperclass2_0Composite( PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, @@ -64,21 +62,12 @@ public class JavaMappedSuperclass2_0Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, buildAccessHolder(), container); + new AccessTypeComboViewer(this, buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaMappedSuperclass, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; - } -}
\ No newline at end of file +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java index 85e0c54c3e..fc144f05f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMapping2_0Composite.java @@ -13,9 +13,9 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_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.java.JavaOneToManyRelationship2_0; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; @@ -31,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaOneToManyMapping2_0Composite - extends AbstractOneToManyMappingComposite<JavaOneToManyMapping, JavaOneToManyRelationship2_0> + extends AbstractOneToManyMappingComposite<OneToManyMapping2_0, JavaOneToManyRelationship2_0, Cascade2_0> //TODO can we now get rid of this interface? just use OneToManyRelationship2_0? { public JavaOneToManyMapping2_0Composite( - PropertyValueModel<? extends JavaOneToManyMapping> mappingModel, + PropertyValueModel<? extends OneToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -56,11 +56,11 @@ public class JavaOneToManyMapping2_0Composite new FetchTypeComboViewer(this, container); // Orphan removal widgets - PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableHolder(); + PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableModel(); new OrphanRemoval2_0TriStateCheckBox(this, orphanRemovableHolder, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -70,7 +70,7 @@ public class JavaOneToManyMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToManyJoiningStrategy2_0Pane(this, this.buildJoiningHolder(), container); + new OneToManyJoiningStrategy2_0Pane(this, this.buildRelationshipModel(), container); } @Override @@ -78,11 +78,11 @@ public class JavaOneToManyMapping2_0Composite return new Ordering2_0Composite(this, container).getControl(); } - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<JavaOneToManyMapping, OrphanRemovable2_0>(this.getSubjectHolder()) { + protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { + return new PropertyAspectAdapter<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getOrphanRemoval(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java index 6bd43546af..ae1741309b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java @@ -11,11 +11,10 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; -import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovalHolder2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneRelationship2_0; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; @@ -31,10 +30,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class JavaOneToOneMapping2_0Composite - extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationship2_0> + extends AbstractOneToOneMapping2_0Composite<OneToOneMapping2_0, JavaOneToOneRelationship2_0, Cascade2_0> { public JavaOneToOneMapping2_0Composite( - PropertyValueModel<? extends JavaOneToOneMapping> mappingModel, + PropertyValueModel<? extends OneToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,11 +61,11 @@ public class JavaOneToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableHolder(); + PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableModel(); new OrphanRemoval2_0TriStateCheckBox(this, orphanRemovableHolder, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -76,15 +75,6 @@ public class JavaOneToOneMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); - } - - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<JavaOneToOneMapping, OrphanRemovable2_0>(getSubjectHolder()) { - @Override - protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); - } - }; + new OneToOneJoiningStrategy2_0Pane(this, buildRelationshipModel(), container); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java index 8e50e71ff2..245cdd9ea6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java @@ -12,7 +12,6 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_1Definition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; @@ -52,7 +51,7 @@ public class EntityMappings2_0DetailsProvider || resourceType.equals(GenericOrmXml2_1Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java index b40d2d2a8b..6172de66dd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmBasicMapping2_0Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingComposite; @@ -45,7 +43,7 @@ public class OrmBasicMapping2_0Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -56,7 +54,7 @@ public class OrmBasicMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -70,13 +68,4 @@ public class OrmBasicMapping2_0Composite return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<BasicMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java index 5e27e20df5..08c9d77155 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -56,27 +54,18 @@ public class OrmElementCollectionMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); new FetchTypeComboViewer(this, container); // Collection table widgets - CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableHolder(), container); + CollectionTable2_0Composite collectionTableComposite = new CollectionTable2_0Composite(this, buildCollectionTableModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; collectionTableComposite.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java deleted file mode 100644 index 1d43ee5e17..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0UiDefinition.java +++ /dev/null @@ -1,52 +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.ui.internal.jpa2.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.AbstractElementCollectionMapping2_0UiDefinition; -import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0; -import org.eclipse.swt.widgets.Composite; - -public class OrmElementCollectionMapping2_0UiDefinition - extends AbstractElementCollectionMapping2_0UiDefinition<ReadOnlyPersistentAttribute, OrmElementCollectionMapping2_0> - implements OrmAttributeMappingUiDefinition<OrmElementCollectionMapping2_0> -{ - // singleton - private static final OrmElementCollectionMapping2_0UiDefinition INSTANCE = - new OrmElementCollectionMapping2_0UiDefinition(); - - - /** - * Return the singleton. - */ - public static OrmAttributeMappingUiDefinition<OrmElementCollectionMapping2_0> instance() { - return INSTANCE; - } - - - /** - * Ensure single instance. - */ - private OrmElementCollectionMapping2_0UiDefinition() { - super(); - } - - public JpaComposite buildAttributeMappingComposite(OrmXmlUiFactory factory, PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return ((OrmXmlUiFactory2_0) factory).createOrmElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java index 35a5503936..9977a90d47 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedIdMapping2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -27,10 +25,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class OrmEmbeddedIdMapping2_0Composite - extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping> + extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping2_0> { public OrmEmbeddedIdMapping2_0Composite( - PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, + PropertyValueModel<? extends EmbeddedIdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -49,7 +47,7 @@ public class OrmEmbeddedIdMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Mapped by relationship widgets EmbeddedIdMapping2_0MappedByRelationshipPane mappedByRelationshipPane = new EmbeddedIdMapping2_0MappedByRelationshipPane(this, getSubjectHolder(), container); @@ -66,14 +64,5 @@ public class OrmEmbeddedIdMapping2_0Composite overridesComposite.getControl().setLayoutData(gridData); return container; - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EmbeddedIdMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java index 8966e5bd9b..e12323c15c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEmbeddedMapping2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.EmbeddedMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedMapping2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -26,10 +24,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class OrmEmbeddedMapping2_0Composite - extends AbstractEmbeddedMappingComposite<EmbeddedMapping> + extends AbstractEmbeddedMappingComposite<EmbeddedMapping2_0> { public OrmEmbeddedMapping2_0Composite( - PropertyValueModel<? extends EmbeddedMapping> mappingModel, + PropertyValueModel<? extends EmbeddedMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -47,7 +45,7 @@ public class OrmEmbeddedMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Overrides widgets EmbeddedMapping2_0OverridesComposite overridesComposite = new EmbeddedMapping2_0OverridesComposite( @@ -59,14 +57,5 @@ public class OrmEmbeddedMapping2_0Composite overridesComposite.getControl().setLayoutData(gridData); return container; - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EmbeddedMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java index 26fd4ab2cf..ec5b2f32ed 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntity2_0Composite.java @@ -13,9 +13,8 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmEntity; 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.OrmEntity2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.EntityNameCombo; @@ -36,10 +35,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEntity2_0Composite - extends AbstractOrmEntityComposite + extends AbstractOrmEntityComposite<OrmEntity2_0> { public OrmEntity2_0Composite( - PropertyValueModel<? extends OrmEntity> entityModel, + PropertyValueModel<? extends OrmEntity2_0> entityModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { @@ -66,14 +65,14 @@ public class OrmEntity2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Id class widgets Hyperlink hyperlink = this.addHyperlink(container,JptUiDetailsMessages.IdClassComposite_label); - new IdClassChooser(this, this.buildIdClassReferenceHolder(), container, hyperlink); + new IdClassChooser(this, this.buildIdClassReferenceModel(), container, hyperlink); // Cacheable widgets - Cacheable2_0TriStateCheckBox cacheableCheckBox = new Cacheable2_0TriStateCheckBox(this, buildCacheableHolder(), container); + Cacheable2_0TriStateCheckBox cacheableCheckBox = new Cacheable2_0TriStateCheckBox(this, buildCacheableModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cacheableCheckBox.getControl().setLayoutData(gridData); @@ -87,11 +86,11 @@ public class OrmEntity2_0Composite return container; } - protected PropertyValueModel<Cacheable2_0> buildCacheableHolder() { - return new PropertyAspectAdapter<OrmEntity, Cacheable2_0>(getSubjectHolder()) { + protected PropertyValueModel<Cacheable2_0> buildCacheableModel() { + return new PropertyAspectAdapter<OrmEntity2_0, Cacheable2_0>(getSubjectHolder()) { @Override protected Cacheable2_0 buildValue_() { - return ((CacheableHolder2_0) this.subject).getCacheable(); + return this.subject.getCacheable(); } }; } @@ -103,11 +102,11 @@ public class OrmEntity2_0Composite @Override protected Control initializeGeneratorsSection(Composite container) { - return new Generation2_0Composite(this, this.buildGeneratorContainerHolder(), container).getControl(); + return new Generation2_0Composite(this, this.buildGeneratorContainerModel(), container).getControl(); } @Override protected Control initializeQueriesSection(Composite container) { - return new Queries2_0Composite(this, this.buildQueryContainerHolder(), container).getControl(); + return new Queries2_0Composite(this, this.buildQueryContainerModel(), container).getControl(); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java index c3d58006cb..80d0435eb2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmIdMapping2_0Composite.java @@ -11,10 +11,8 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.IdMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.IdMapping2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractIdMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -28,10 +26,10 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; public class OrmIdMapping2_0Composite - extends AbstractIdMappingComposite<IdMapping> + extends AbstractIdMappingComposite<IdMapping2_0> { public OrmIdMapping2_0Composite( - PropertyValueModel<? extends IdMapping> mappingModel, + PropertyValueModel<? extends IdMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -50,7 +48,7 @@ public class OrmIdMapping2_0Composite mappedByRelationshipPane.getControl().setLayoutData(gridData); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -61,7 +59,7 @@ public class OrmIdMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); return container; } @@ -70,13 +68,4 @@ public class OrmIdMapping2_0Composite protected void initializeGenerationCollapsibleSection(Composite container) { new IdMappingGeneration2_0Composite(this, container); } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<IdMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java index 6e22190555..1345322345 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToManyMapping2_0Composite.java @@ -12,8 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToManyMapping2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractManyToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -30,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmManyToManyMapping2_0Composite - extends AbstractManyToManyMappingComposite<ManyToManyMapping, ManyToManyRelationship> + extends AbstractManyToManyMappingComposite<ManyToManyMapping2_0, ManyToManyRelationship, Cascade2_0> { public OrmManyToManyMapping2_0Composite( - PropertyValueModel<? extends ManyToManyMapping> mappingModel, + PropertyValueModel<? extends ManyToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -56,14 +57,14 @@ public class OrmManyToManyMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); new FetchTypeComboViewer(this, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java index 502de0e70a..9aa565680f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmManyToOneMapping2_0Composite.java @@ -11,10 +11,9 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.ManyToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -32,10 +31,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmManyToOneMapping2_0Composite - extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping, ManyToOneRelationship2_0> + extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping2_0, ManyToOneRelationship2_0, Cascade2_0> { public OrmManyToOneMapping2_0Composite( - PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<? extends ManyToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -58,7 +57,7 @@ public class OrmManyToOneMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -71,20 +70,11 @@ public class OrmManyToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<ManyToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java index 9e184fa7c2..c9d8006d5a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMapping2_0Composite.java @@ -13,11 +13,10 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToManyMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_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.OrmCascade2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractOneToManyMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -36,10 +35,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmOneToManyMapping2_0Composite - extends AbstractOneToManyMappingComposite<OneToManyMapping, OneToManyRelationship2_0> + extends AbstractOneToManyMappingComposite<OneToManyMapping2_0, OneToManyRelationship2_0, OrmCascade2_0> { public OrmOneToManyMapping2_0Composite( - PropertyValueModel<? extends OneToManyMapping> mappingModel, + PropertyValueModel<? extends OneToManyMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,18 +61,18 @@ public class OrmOneToManyMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); new FetchTypeComboViewer(this, container); // Orphan removal widgets - PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableHolder(); + PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableModel(); new OrphanRemoval2_0TriStateCheckBox(this, orphanRemovableHolder, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, this.buildCascadeModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -83,28 +82,19 @@ public class OrmOneToManyMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToManyJoiningStrategy2_0Pane(this, this.buildJoiningHolder(), container); + new OneToManyJoiningStrategy2_0Pane(this, this.buildRelationshipModel(), container); } @Override protected Control initializeOrderingSection(Composite container) { return new Ordering2_0Composite(this, container).getControl(); } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToManyMapping, AccessHolder>(this.getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<OneToManyMapping, OrphanRemovable2_0>(this.getSubjectHolder()) { + protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { + return new PropertyAspectAdapter<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); + return this.subject.getOrphanRemoval(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java index 93a26491c7..cde0f23eb6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToOneMapping2_0Composite.java @@ -11,13 +11,11 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; -import org.eclipse.jpt.jpa.core.context.OneToOneMapping; +import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_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.OrmCascade2_0; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.FetchTypeComboViewer; @@ -36,10 +34,10 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmOneToOneMapping2_0Composite - extends AbstractOneToOneMapping2_0Composite<OneToOneMapping, OneToOneRelationship2_0> + extends AbstractOneToOneMapping2_0Composite<OneToOneMapping2_0, OneToOneRelationship2_0, OrmCascade2_0> { public OrmOneToOneMapping2_0Composite( - PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<? extends OneToOneMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, @@ -62,7 +60,7 @@ public class OrmOneToOneMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); // Fetch type widgets this.addLabel(container, JptUiDetailsMessages.BasicGeneralSection_fetchLabel); @@ -75,11 +73,11 @@ public class OrmOneToOneMapping2_0Composite optionalCheckBox.getControl().setLayoutData(gridData); // Orphan removal widgets - PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableHolder(); + PropertyValueModel<OrphanRemovable2_0> orphanRemovableHolder = buildOrphanRemovableModel(); new OrphanRemoval2_0TriStateCheckBox(this, orphanRemovableHolder, container); // Cascade widgets - CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeHolder(), container); + CascadePane2_0 cascadePane = new CascadePane2_0(this, buildCascadeModel(), container); gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; cascadePane.getControl().setLayoutData(gridData); @@ -89,24 +87,6 @@ public class OrmOneToOneMapping2_0Composite @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { - new OneToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<OneToOneMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } - - protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableHolder() { - return new PropertyAspectAdapter<OneToOneMapping, OrphanRemovable2_0>(getSubjectHolder()) { - @Override - protected OrphanRemovable2_0 buildValue_() { - return ((OrphanRemovalHolder2_0) this.subject).getOrphanRemoval(); - } - }; + new OneToOneJoiningStrategy2_0Pane(this, buildRelationshipModel(), container); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java index 07b921864f..098ddc6af8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmVersionMapping2_0Composite.java @@ -11,9 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.VersionMapping; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractVersionMappingComposite; @@ -42,7 +40,7 @@ public class OrmVersionMapping2_0Composite container = this.addSubPane(container, 2, 0, 0, 0, 0); // Column widgets - ColumnComposite columnComposite = new ColumnComposite(this, buildColumnHolder(), container); + ColumnComposite columnComposite = new ColumnComposite(this, buildColumnModel(), container); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.horizontalSpan = 2; columnComposite.getControl().setLayoutData(gridData); @@ -53,17 +51,8 @@ public class OrmVersionMapping2_0Composite // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<VersionMapping, AccessHolder>(getSubjectHolder()) { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentAttribute(); - } - }; - } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java index c286c1fccd..35bc0d15c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java @@ -12,29 +12,24 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.GenericOrmXml2_0UiFactory; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class OrmXml2_0UiDefinition extends AbstractOrmXmlResourceUiDefinition @@ -60,7 +55,7 @@ public class OrmXml2_0UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new GenericOrmXml2_0UiFactory(); } @@ -73,25 +68,18 @@ public class OrmXml2_0UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java index 7f7f6e0670..98667c7480 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java @@ -12,29 +12,24 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import java.util.List; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; -import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_1Definition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmAttributeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; +import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.IdMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmBasicMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddableUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEmbeddedMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmEntityUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmVersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.GenericOrmXml2_0UiFactory; +import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; public class OrmXml2_1UiDefinition extends AbstractOrmXmlResourceUiDefinition @@ -60,7 +55,7 @@ public class OrmXml2_1UiDefinition @Override - protected OrmXmlUiFactory buildOrmXmlUiFactory() { + protected JpaUiFactory buildUiFactory() { return new GenericOrmXml2_0UiFactory(); } @@ -73,25 +68,18 @@ public class OrmXml2_1UiDefinition } @Override - protected void addOrmAttributeMappingUiDefinitionsTo(List<OrmAttributeMappingUiDefinition<? extends AttributeMapping>> definitions) { - definitions.add(OrmIdMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedIdMappingUiDefinition.instance()); - definitions.add(OrmBasicMappingUiDefinition.instance()); - definitions.add(OrmVersionMappingUiDefinition.instance()); - definitions.add(OrmManyToOneMappingUiDefinition.instance()); - definitions.add(OrmOneToManyMappingUiDefinition.instance()); - definitions.add(OrmOneToOneMappingUiDefinition.instance()); - definitions.add(OrmManyToManyMappingUiDefinition.instance()); - definitions.add(OrmEmbeddedMappingUiDefinition.instance()); - definitions.add(OrmTransientMappingUiDefinition.instance()); + protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { + definitions.add(IdMappingUiDefinition.instance()); + definitions.add(EmbeddedIdMappingUiDefinition.instance()); + definitions.add(BasicMappingUiDefinition.instance()); + definitions.add(VersionMappingUiDefinition.instance()); + definitions.add(ManyToOneMappingUiDefinition.instance()); + definitions.add(OneToManyMappingUiDefinition.instance()); + definitions.add(OneToOneMappingUiDefinition.instance()); + definitions.add(ManyToManyMappingUiDefinition.instance()); + definitions.add(EmbeddedMappingUiDefinition.instance()); + definitions.add(TransientMappingUiDefinition.instance()); - definitions.add(OrmElementCollectionMapping2_0UiDefinition.instance()); - } - - @Override - protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) { - definitions.add(OrmEntityUiDefinition.instance()); - definitions.add(OrmMappedSuperclassUiDefinition.instance()); - definitions.add(OrmEmbeddableUiDefinition.instance()); + definitions.add(ElementCollectionMapping2_0UiDefinition.instance()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java index 09688ace01..82f458153f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/MapAsContribution.java @@ -14,13 +14,9 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.jface.action.IContributionItem; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.filter.Filter; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.ComparatorAdapter; -import org.eclipse.jpt.common.utility.internal.filter.FilterAdapter; import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; @@ -66,7 +62,7 @@ public abstract class MapAsContribution<T extends JpaStructureNode> } protected Iterable<IContributionItem> getContributionItems_() { - return new TransformationIterable<MappingUiDefinition<T, ?>, IContributionItem>( + return new TransformationIterable<MappingUiDefinition, IContributionItem>( this.getMappingUiDefinitions(), new MappingUiDefinitionTransformer() ); @@ -77,7 +73,7 @@ public abstract class MapAsContribution<T extends JpaStructureNode> * safe assumption) and return the mapping UI definitions for just the * first item. */ - protected Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions() { + protected Iterable<MappingUiDefinition> getMappingUiDefinitions() { return this.getMappingUiDefinitions(this.getFirstSelectedElement()); } @@ -98,57 +94,32 @@ public abstract class MapAsContribution<T extends JpaStructureNode> * Return the {@link MappingUiDefinition}s for the specified node * registered with its {@link JpaPlatformUi}. */ - protected Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions(final T node) { + protected Iterable<MappingUiDefinition> getMappingUiDefinitions(final T node) { JpaPlatformUi jpaPlatformUi = (JpaPlatformUi) node.getJpaPlatform().getAdapter(JpaPlatformUi.class); - Iterable<? extends MappingUiDefinition<T, ?>> defs = this.getSortedEnabledMappingUiDefinitions(jpaPlatformUi, node); - DefaultMappingUiDefinition<T, ?> defaultDef = this.getDefaultMappingUiDefinition(jpaPlatformUi, node); - return (defaultDef == null) ? defs : new CompositeIterable<MappingUiDefinition<T, ?>>(defaultDef, defs); + Iterable<MappingUiDefinition> defs = this.getSortedMappingUiDefinitions(jpaPlatformUi, node); + DefaultMappingUiDefinition defaultDef = this.getDefaultMappingUiDefinition(jpaPlatformUi, node); + return (defaultDef == null) ? defs : new CompositeIterable<MappingUiDefinition>(defaultDef, defs); } - protected Iterable<? extends MappingUiDefinition<T, ?>> getSortedEnabledMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, T node) { - return IterableTools.sort(this.getEnabledMappingUiDefinitions(jpaPlatformUi, node), this.getDefinitionsComparator()); - } - - protected Iterable<? extends MappingUiDefinition<T, ?>> getEnabledMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, T node) { - return new FilteringIterable<MappingUiDefinition<T, ?>>( - this.getMappingUiDefinitions(jpaPlatformUi, node.getResourceType()), - this.buildEnabledDefinitionFilter(node) - ); - } - - protected Filter<MappingUiDefinition<T, ?>> buildEnabledDefinitionFilter(T node) { - return new EnabledDefinitionFilter(node); - } - - protected class EnabledDefinitionFilter - extends FilterAdapter<MappingUiDefinition<T, ?>> - { - protected final T node; - protected EnabledDefinitionFilter(T node) { - super(); - this.node = node; - } - @Override - public boolean accept(MappingUiDefinition<T, ?> def) { - return def.isEnabledFor(this.node); - } + protected Iterable<MappingUiDefinition> getSortedMappingUiDefinitions(JpaPlatformUi jpaPlatformUi, T node) { + return IterableTools.sort(this.getMappingUiDefinitions(jpaPlatformUi, node), this.getDefinitionsComparator()); } /** * Return the mapping UI definitions registered with the specified JPA * platform UI for the specified resource type. */ - protected abstract Iterable<? extends MappingUiDefinition<T, ?>> getMappingUiDefinitions(JpaPlatformUi platformUi, JptResourceType resourceType); + protected abstract Iterable<MappingUiDefinition> getMappingUiDefinitions(JpaPlatformUi platformUi, T node); - protected Comparator<MappingUiDefinition<?, ?>> getDefinitionsComparator() { + protected Comparator<MappingUiDefinition> getDefinitionsComparator() { return MAPPING_UI_DEFINITION_COMPARATOR; } - protected static final Comparator<MappingUiDefinition<?, ?>> MAPPING_UI_DEFINITION_COMPARATOR = new MappingUiDefinitionComparator(); + protected static final Comparator<MappingUiDefinition> MAPPING_UI_DEFINITION_COMPARATOR = new MappingUiDefinitionComparator(); protected static class MappingUiDefinitionComparator - extends ComparatorAdapter<MappingUiDefinition<?, ?>> + extends ComparatorAdapter<MappingUiDefinition> { @Override - public int compare(MappingUiDefinition<?, ?> def1, MappingUiDefinition<?, ?> def2) { + public int compare(MappingUiDefinition def1, MappingUiDefinition def2) { return Collator.getInstance().compare(def1.getLabel(), def2.getLabel()); } } @@ -157,22 +128,22 @@ public abstract class MapAsContribution<T extends JpaStructureNode> * Return the default mapping definition for the specified JPA platform UI * and node. */ - protected abstract DefaultMappingUiDefinition<T, ?> getDefaultMappingUiDefinition(JpaPlatformUi platformUi, T node); + protected abstract DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi platformUi, T node); protected class MappingUiDefinitionTransformer - extends TransformerAdapter<MappingUiDefinition<T, ?>, IContributionItem> + extends TransformerAdapter<MappingUiDefinition, IContributionItem> { @Override - public IContributionItem transform(MappingUiDefinition<T, ?> def) { + public IContributionItem transform(MappingUiDefinition def) { return MapAsContribution.this.buildContributionItem(def); } } - protected IContributionItem buildContributionItem(MappingUiDefinition<T, ?> mappingUiProvider) { + protected IContributionItem buildContributionItem(MappingUiDefinition mappingUiProvider) { return new CommandContributionItem(this.buildContributionItemParameter(mappingUiProvider)); } - protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition<T, ?> mappingUiDefinition) { + protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition mappingUiDefinition) { CommandContributionItemParameter parameter = new CommandContributionItemParameter( this.serviceLocator, @@ -195,7 +166,7 @@ public abstract class MapAsContribution<T extends JpaStructureNode> * <code>"<<em>command ID</em>>.<<em>mapping key</em>>"</code> * (e.g. <code>"org.eclipse.jpt.jpa.core.ui.persistentTypeMapAs.entity"</code>) */ - protected String buildCommandContributionItemParameterID(MappingUiDefinition<T, ?> mappingUiDefinition) { + protected String buildCommandContributionItemParameterID(MappingUiDefinition mappingUiDefinition) { return this.getCommandID() + '.' + mappingUiDefinition.getKey(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java index e4be04e1cc..78a298dd59 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentAttributeMapAsContribution.java @@ -41,27 +41,27 @@ public class PersistentAttributeMapAsContribution } @Override - protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition<ReadOnlyPersistentAttribute, ?> mappingUiProvider) { + protected CommandContributionItemParameter buildContributionItemParameter(MappingUiDefinition mappingUiProvider) { CommandContributionItemParameter parameter = super.buildContributionItemParameter(mappingUiProvider); String defaultKey = null; - if (mappingUiProvider instanceof DefaultMappingUiDefinition<?, ?>) { - defaultKey = ((DefaultMappingUiDefinition<? extends PersistentAttribute, ?>) mappingUiProvider).getDefaultKey(); + if (mappingUiProvider instanceof DefaultMappingUiDefinition) { + defaultKey = ((DefaultMappingUiDefinition) mappingUiProvider).getDefaultKey(); } parameter.parameters.put(PersistentAttributeMapAsHandler.DEFAULT_MAPPING_COMMAND_PARAMETER_ID, defaultKey); return parameter; } @Override - protected Iterable<? extends MappingUiDefinition<ReadOnlyPersistentAttribute, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, JptResourceType resourceType) { - return jpaPlatformUI.getAttributeMappingUiDefinitions(resourceType); + protected Iterable<MappingUiDefinition> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, ReadOnlyPersistentAttribute node) { + return jpaPlatformUI.getAttributeMappingUiDefinitions(node); } @Override - protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, ReadOnlyPersistentAttribute node) { + protected DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, ReadOnlyPersistentAttribute node) { return getDefaultMappingUiDefinition(jpaPlatformUI, ((PersistentAttribute) node).getDefaultMappingKey(), node.getResourceType()); } - protected DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, String defaultMappingKey, JptResourceType resourceType) { + protected DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, String defaultMappingKey, JptResourceType resourceType) { return jpaPlatformUI.getDefaultAttributeMappingUiDefinition(resourceType, defaultMappingKey); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java index db8e79e325..60e9aca982 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/menus/PersistentTypeMapAsContribution.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.menus; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; @@ -39,12 +38,12 @@ public class PersistentTypeMapAsContribution } @Override - protected Iterable<? extends MappingUiDefinition<PersistentType, ?>> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, JptResourceType resourceType) { - return jpaPlatformUI.getTypeMappingUiDefinitions(resourceType); + protected Iterable<MappingUiDefinition> getMappingUiDefinitions(JpaPlatformUi jpaPlatformUI, PersistentType node) { + return jpaPlatformUI.getTypeMappingUiDefinitions(node); } @Override - protected DefaultMappingUiDefinition<PersistentType, ?> getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, PersistentType node) { + protected DefaultMappingUiDefinition getDefaultMappingUiDefinition(JpaPlatformUi jpaPlatformUI, PersistentType node) { return jpaPlatformUI.getDefaultTypeMappingUiDefinition(node.getResourceType()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java index 3ab0f8f82d..1254e301cc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java @@ -40,8 +40,6 @@ import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.transformer.Transformer; -import org.eclipse.jpt.jpa.core.context.PersistentType; -import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.core.context.persistence.ClassRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -222,7 +220,7 @@ public class PersistenceUnitClassesComposite JptCommonUiImages.WARNING; } - private MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(JavaPersistentType persistentType) { + private MappingUiDefinition getTypeMappingUiDefinition(JavaPersistentType persistentType) { return this.getJpaPlatformUi(persistentType).getTypeMappingUiDefinition(persistentType.getResourceType(), persistentType.getMappingKey()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java index 134259957b..08bad059ae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java @@ -18,11 +18,14 @@ import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.util.SWTUtil; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; +import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AttributeMapping; +import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeMapping; @@ -88,7 +91,7 @@ public abstract class AbstractJpaPlatformUi // ********** details providers ********** - public JpaDetailsPageManager<? extends JpaStructureNode> buildJpaDetailsPageManager(Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory, ResourceManager resourceManager) { + public JpaDetailsPageManager buildJpaDetailsPageManager(Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory, ResourceManager resourceManager) { JpaDetailsProvider provider = this.getDetailsProvider(structureNode); return (provider == null) ? null : provider.buildDetailsPageManager(parent, widgetFactory, resourceManager); } @@ -109,19 +112,23 @@ public abstract class AbstractJpaPlatformUi // ********** type mappings ********** - public JpaComposite buildTypeMappingComposite(JptResourceType resourceType, String mappingKey, Composite parentComposite, PropertyValueModel<TypeMapping> mappingModel, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return this.getMappingResourceUiDefinition(resourceType).buildTypeMappingComposite(mappingKey, mappingModel, parentComposite, widgetFactory, resourceManager); + public JpaComposite buildTypeMappingComposite(JptResourceType resourceType, String mappingKey, PropertyValueModel<TypeMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { + return this.getMappingResourceUiDefinition(resourceType).buildTypeMappingComposite(mappingKey, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public Iterable<MappingUiDefinition<PersistentType, ? extends TypeMapping>> getTypeMappingUiDefinitions(JptResourceType resourceType) { + public Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(PersistentType persistentType) { + return IterableTools.filter(this.getTypeMappingUiDefinitions(persistentType.getResourceType()), new UiDefinitionFilter(persistentType)); + } + + public Iterable<MappingUiDefinition> getTypeMappingUiDefinitions(JptResourceType resourceType) { return this.getMappingResourceUiDefinition(resourceType).getTypeMappingUiDefinitions(); } - public MappingUiDefinition<PersistentType, ? extends TypeMapping> getTypeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { + public MappingUiDefinition getTypeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { return this.getMappingResourceUiDefinition(resourceType).getTypeMappingUiDefinition(mappingKey); } - public DefaultMappingUiDefinition<PersistentType, ? extends TypeMapping> getDefaultTypeMappingUiDefinition(JptResourceType resourceType) { + public DefaultMappingUiDefinition getDefaultTypeMappingUiDefinition(JptResourceType resourceType) { return this.getMappingResourceUiDefinition(resourceType).getDefaultTypeMappingUiDefinition(); } @@ -132,19 +139,38 @@ public abstract class AbstractJpaPlatformUi return this.getMappingResourceUiDefinition(resourceType).buildAttributeMappingComposite(mappingKey, mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - public Iterable<MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping>> getAttributeMappingUiDefinitions(JptResourceType resourceType) { + public Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions(ReadOnlyPersistentAttribute persistentAttribute) { + return IterableTools.filter(this.getAttributeMappingUiDefinitions(persistentAttribute.getResourceType()), new UiDefinitionFilter(persistentAttribute)); + } + + public Iterable<MappingUiDefinition> getAttributeMappingUiDefinitions(JptResourceType resourceType) { return this.getMappingResourceUiDefinition(resourceType).getAttributeMappingUiDefinitions(); } - public MappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { + public MappingUiDefinition getAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { return this.getMappingResourceUiDefinition(resourceType).getAttributeMappingUiDefinition(mappingKey); } - public DefaultMappingUiDefinition<ReadOnlyPersistentAttribute, ? extends AttributeMapping> getDefaultAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { + public DefaultMappingUiDefinition getDefaultAttributeMappingUiDefinition(JptResourceType resourceType, String mappingKey) { return this.getMappingResourceUiDefinition(resourceType).getDefaultAttributeMappingUiDefinition(mappingKey); } + /* CU private */ class UiDefinitionFilter + extends Filter.Adapter<MappingUiDefinition> + { + private final JpaContextNode node; + + public UiDefinitionFilter(JpaContextNode node) { + super(); + this.node = node; + } + @Override + public boolean accept(MappingUiDefinition mappingUiDefinition) { + return mappingUiDefinition.isEnabledFor(this.node); + } + } + // ********** resource ui definitions ********** protected Iterable<ResourceUiDefinition> getResourceUiDefinitions() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java index 872f08da8f..736c4f09a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentAttributeItemLabelProvider.java @@ -64,11 +64,11 @@ public class PersistentAttributeItemLabelProvider { @Override public ImageDescriptor transform(AttributeMapping attributeMapping) { - MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?> definition = this.getAttributeMappingUiDefinition(attributeMapping); + MappingUiDefinition definition = this.getAttributeMappingUiDefinition(attributeMapping); return JptCommonUiImages.gray(definition.getImageDescriptor(), attributeMapping.getPersistentAttribute().isVirtual()); } - private MappingUiDefinition<? extends ReadOnlyPersistentAttribute, ?> getAttributeMappingUiDefinition(AttributeMapping attributeMapping) { + private MappingUiDefinition getAttributeMappingUiDefinition(AttributeMapping attributeMapping) { return this.getJpaPlatformUi(attributeMapping).getAttributeMappingUiDefinition(attributeMapping.getResourceType(), attributeMapping.getKey()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java index 7809512623..1dd84150c1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/PersistentTypeItemLabelProvider.java @@ -66,7 +66,7 @@ public class PersistentTypeItemLabelProvider return this.getTypeMappingUiDefinition(typeMapping).getImageDescriptor(); } - private MappingUiDefinition<? extends PersistentType, ?> getTypeMappingUiDefinition(TypeMapping typeMapping) { + private MappingUiDefinition getTypeMappingUiDefinition(TypeMapping typeMapping) { return this.getJpaPlatformUi(typeMapping).getTypeMappingUiDefinition(typeMapping.getResourceType(), typeMapping.getKey()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java index c42f0141d4..67a6d0e498 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java @@ -72,7 +72,7 @@ public class JpaDetailsView * The current JPA details page manager that was built based on the * current JPA selection. */ - private volatile JpaDetailsPageManager<? extends JpaStructureNode> currentPageManager; + private volatile JpaDetailsPageManager currentPageManager; /** * The resource manager is created when the view's control is @@ -109,8 +109,8 @@ public class JpaDetailsView * Cache of JPA details page managers * keyed by JPA structure node context type. */ - private final HashMap<JpaStructureNode.ContextType, JpaDetailsPageManager<? extends JpaStructureNode>> pageManagers = - new HashMap<JpaStructureNode.ContextType, JpaDetailsPageManager<? extends JpaStructureNode>>(); + private final HashMap<JpaStructureNode.ContextType, JpaDetailsPageManager> pageManagers = + new HashMap<JpaStructureNode.ContextType, JpaDetailsPageManager>(); public JpaDetailsView() { @@ -208,7 +208,7 @@ public class JpaDetailsView } } } else { // node => node - JpaDetailsPageManager<? extends JpaStructureNode> pageManager = this.getPageManager(node); + JpaDetailsPageManager pageManager = this.getPageManager(node); if (pageManager != this.currentPageManager) { try { this.currentPageManager.setSubject(null); @@ -246,9 +246,9 @@ public class JpaDetailsView /** * @see org.eclipse.jpt.jpa.core.JpaStructureNode.ContextType */ - private JpaDetailsPageManager<? extends JpaStructureNode> getPageManager(JpaStructureNode node) { + private JpaDetailsPageManager getPageManager(JpaStructureNode node) { JpaStructureNode.ContextType nodeType = node.getContextType(); - JpaDetailsPageManager<? extends JpaStructureNode> pageManager = this.pageManagers.get(nodeType); + JpaDetailsPageManager pageManager = this.pageManagers.get(nodeType); if (pageManager == null) { pageManager = this.buildPageManager(node); if (pageManager != null) { @@ -258,7 +258,7 @@ public class JpaDetailsView return pageManager; } - private JpaDetailsPageManager<? extends JpaStructureNode> buildPageManager(JpaStructureNode node) { + private JpaDetailsPageManager buildPageManager(JpaStructureNode node) { return this.getJpaDetailsPageManagerFactory(node).buildPageManager(this.pageBook, this.widgetFactory, this.resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java index a1b5f413dc..775fd0f166 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/JpaMakePersistentWizardPage.java @@ -67,7 +67,6 @@ import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; -import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; @@ -387,7 +386,7 @@ public class JpaMakePersistentWizardPage @Override protected void setValue(Object element, Object value) { - ((Type) element).setMappingKey(((MappingUiDefinition<?, ?>) value).getKey()); + ((Type) element).setMappingKey(((MappingUiDefinition) value).getKey()); getViewer().update(element, null); } @@ -416,7 +415,7 @@ public class JpaMakePersistentWizardPage return new ColumnLabelProvider() { @Override public String getText(Object element) { - return ((MappingUiDefinition<?, ?>) element).getLabel(); + return ((MappingUiDefinition) element).getLabel(); } }; } @@ -424,7 +423,7 @@ public class JpaMakePersistentWizardPage protected IStructuredContentProvider buildMappingComboCellEditorContentProvider() { return new IStructuredContentProvider() { public Object[] getElements(Object inputElement) { - return ArrayTools.array(((Type) inputElement).typeMappingUiDefinitions()); + return ArrayTools.array(((Type) inputElement).getTypeMappingUiDefinitions()); } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -458,7 +457,7 @@ public class JpaMakePersistentWizardPage return this.getMappingUiDefinition(element).getImageDescriptor(); } - private MappingUiDefinition<? extends PersistentType, ?> getMappingUiDefinition(Object element) { + private MappingUiDefinition getMappingUiDefinition(Object element) { return JpaMakePersistentWizardPage.this.getMappingUiDefinition(((Type) element).mappingKey); } private ResourceManager getResourceManager() { @@ -466,14 +465,14 @@ public class JpaMakePersistentWizardPage } } - protected MappingUiDefinition<? extends PersistentType, ?> getMappingUiDefinition(String mappingKey) { + protected MappingUiDefinition getMappingUiDefinition(String mappingKey) { return this.getJpaPlatformUi().getTypeMappingUiDefinition(this.jptResourceType, mappingKey); } - protected Iterable<String> typeMappingKeys(Iterable<? extends MappingUiDefinition<? extends PersistentType, ?>> mappingUiDefinitions) { - return new TransformationIterable<MappingUiDefinition<? extends PersistentType, ?>, String>(mappingUiDefinitions) { + protected Iterable<String> typeMappingKeys(Iterable<? extends MappingUiDefinition> mappingUiDefinitions) { + return new TransformationIterable<MappingUiDefinition, String>(mappingUiDefinitions) { @Override - protected String transform(MappingUiDefinition<? extends PersistentType, ?> next) { + protected String transform(MappingUiDefinition next) { return next.getKey(); } }; @@ -605,7 +604,7 @@ public class JpaMakePersistentWizardPage this.mappingKey = mappingKey; } - protected Iterable<? extends MappingUiDefinition<? extends PersistentType, ?>> typeMappingUiDefinitions() { + protected Iterable<MappingUiDefinition> getTypeMappingUiDefinitions() { return getJpaPlatformUi().getTypeMappingUiDefinitions(JpaMakePersistentWizardPage.this.jptResourceType); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/JpaUiFactory2_0.java index f40fc6543c..0d03632463 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/java/JavaUiFactory2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/JpaUiFactory2_0.java @@ -7,18 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.jpa2.details.java; +package org.eclipse.jpt.jpa.ui.jpa2.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; +import org.eclipse.jpt.jpa.core.jpa2.context.ElementCollectionMapping2_0; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; +import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.swt.widgets.Composite; /** - * Use a Java UI factory to create any Java JPA composites. + * Use a JPA UI factory to create any JPA composites. * <p> * Provisional API: This interface is part of an interim API that is still under * development and expected to change significantly before reaching stability. @@ -26,14 +26,14 @@ import org.eclipse.swt.widgets.Composite; * adopters on the understanding that any code that uses this API will almost * certainly be broken (repeatedly) as the API evolves. * - * @version 3.0 - * @since 3.0 + * @version 3.3 + * @since 3.3 */ -public interface JavaUiFactory2_0 - extends JavaUiFactory +public interface JpaUiFactory2_0 + extends JpaUiFactory { - JpaComposite createJavaElementCollectionMapping2_0Composite( - PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, + JpaComposite createElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, WidgetFactory widgetFactory, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java deleted file mode 100644 index 5e5f537c5a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/jpa2/details/orm/OrmXmlUiFactory2_0.java +++ /dev/null @@ -1,42 +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.ui.jpa2.details.orm; - -import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -/** - * Use an <code>orm.xml</code> UI factory to create any <code>orm.xml</code> - * JPA composites. - * <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.0 - * @since 3.0 - */ -public interface OrmXmlUiFactory2_0 - extends OrmXmlUiFactory -{ - JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, - PropertyValueModel<Boolean> enabledModel, - Composite parentComposite, - WidgetFactory widgetFactory, - ResourceManager resourceManager); -}
\ No newline at end of file |