diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org')
4 files changed, 169 insertions, 15 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java index b1e1438c8a..3da728716b 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/EclipseLinkJavaUiFactory.java @@ -34,9 +34,6 @@ import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkOneToOneMappin import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkTransformationMappingComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkVersionMappingComposite; -import org.eclipse.jpt.eclipselink.ui.internal.details.java.JavaEclipseLinkEmbeddableComposite; -import org.eclipse.jpt.eclipselink.ui.internal.details.java.JavaEclipseLinkEntityComposite; -import org.eclipse.jpt.eclipselink.ui.internal.details.java.JavaEclipseLinkMappedSuperclassComposite; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.details.java.BaseJavaUiFactory; @@ -109,7 +106,7 @@ public class EclipseLinkJavaUiFactory extends BaseJavaUiFactory @Override public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<? extends JavaOneToManyMapping> subjectHolder, + PropertyValueModel<JavaOneToManyMapping> subjectHolder, Composite parent, WidgetFactory widgetFactory) { return new EclipseLinkOneToManyMappingComposite(subjectHolder, parent, widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java index c1a2c37fde..ea993f20c4 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/EclipseLink2_0JavaUiFactory.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.java; import org.eclipse.jpt.core.context.java.JavaEntity; import org.eclipse.jpt.core.context.java.JavaIdMapping; import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.core.jpa2.context.java.JavaElementCollectionMapping2_0; import org.eclipse.jpt.eclipselink.ui.internal.v1_1.details.java.EclipseLink1_1JavaUiFactory; @@ -59,6 +60,14 @@ public class EclipseLink2_0JavaUiFactory } @Override + public JpaComposite createJavaOneToManyMappingComposite( + PropertyValueModel<JavaOneToManyMapping> subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new JavaEclipseLinkOneToManyMapping2_0Composite(subjectHolder, parent, widgetFactory); + } + + @Override public JpaComposite createJavaOneToOneMappingComposite( PropertyValueModel<JavaOneToOneMapping> subjectHolder, Composite parent, diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java new file mode 100644 index 0000000000..ad1c857478 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToManyMapping2_0Composite.java @@ -0,0 +1,140 @@ +/******************************************************************************* +* Copyright (c) 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.eclipselink.ui.internal.v2_0.details.java; + +import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; +import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToManyRelationshipReference; +import org.eclipse.jpt.eclipselink.core.context.EclipseLinkPrivateOwned; +import org.eclipse.jpt.eclipselink.core.v2_0.context.EclipseLinkOneToManyMapping2_0; +import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; +import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkOneToManyJoiningStrategyPane; +import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedComposite; +import org.eclipse.jpt.ui.WidgetFactory; +import org.eclipse.jpt.ui.internal.details.AbstractOneToManyMappingComposite; +import org.eclipse.jpt.ui.internal.details.CascadeComposite; +import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; +import org.eclipse.jpt.ui.internal.details.OrderingComposite; +import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; +import org.eclipse.jpt.ui.internal.jpa2.details.OrphanRemoval2_0Composite; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.swt.widgets.Composite; + +/** + * Here the layout of this pane: + * <pre> + * ----------------------------------------------------------------------------- + * | ------------------------------------------------------------------------- | + * | | | | + * | | TargetEntityComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | EclipseLinkOneToManyJoiningStrategyPane | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | FetchTypeComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | EclipseLinkJoinFetchComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | EclipseLinkPrivateOwnedComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | CascadeComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | OrphanRemoval2_0Composite | | + * | | | | + * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | OrderingComposite | | + * | | | | + * | ------------------------------------------------------------------------- | + * -----------------------------------------------------------------------------</pre> + * + * @see {@link JavaOneToManyMapping2_0} + * @see {@link TargetEntityComposite} + * @see {@link EclipseLinkOneToManyJoiningStrategyPane} + * @see {@link FetchTypeComposite} + * @see {@link EclipseLinkJoinFetchComposite} + * @see {@link EclipseLinkPrivateOwnedComposite} + * @see {@link CascadeComposite} + * @see {@link OrphanRemoval2_0Composite} + * @see {@link OrderingComposite} + */ +public class JavaEclipseLinkOneToManyMapping2_0Composite<T extends EclipseLinkOneToManyMapping2_0> + extends AbstractOneToManyMappingComposite<T> +{ + public JavaEclipseLinkOneToManyMapping2_0Composite( + PropertyValueModel<? extends T> subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + + super(subjectHolder, parent, widgetFactory); + } + + @Override + protected void initializeLayout(Composite container) { + int groupBoxMargin = this.getGroupBoxMargin(); + + new TargetEntityComposite(this, this.addPane(container, groupBoxMargin)); + new EclipseLinkOneToManyJoiningStrategyPane(this, this.buildEclipseLinkJoiningHolder(), container); + new FetchTypeComposite(this, this.addPane(container, groupBoxMargin)); + new EclipseLinkJoinFetchComposite(this, this.buildJoinFetchableHolder(), this.addPane(container, groupBoxMargin)); + new EclipseLinkPrivateOwnedComposite(this, this.buildPrivateOwnableHolder(), this.addPane(container, groupBoxMargin)); + new CascadeComposite(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); + new OrphanRemoval2_0Composite(this, this.addPane(container, groupBoxMargin)); + new OrderingComposite(this, container); + } + + protected PropertyValueModel<EclipseLinkOneToManyRelationshipReference> buildEclipseLinkJoiningHolder() { + return new TransformationPropertyValueModel<T, EclipseLinkOneToManyRelationshipReference>(this.getSubjectHolder()) { + @Override + protected EclipseLinkOneToManyRelationshipReference transform_(T value) { + return value.getRelationshipReference(); + } + }; + } + + protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(this.getSubjectHolder()) { + @Override + protected EclipseLinkJoinFetch buildValue_() { + return this.subject.getJoinFetch(); + } + }; + } + + protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { + return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { + @Override + protected EclipseLinkPrivateOwned buildValue_() { + return this.subject.getPrivateOwned(); + } + }; + } + +} +
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java index c8d750328b..2fcd95953e 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkOneToOneMapping2_0Composite.java @@ -23,6 +23,7 @@ import org.eclipse.jpt.ui.internal.details.OptionalComposite; import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; import org.eclipse.jpt.ui.internal.jpa2.details.AbstractOneToOneMapping2_0Composite; import org.eclipse.jpt.ui.internal.jpa2.details.DerivedId2_0Pane; +import org.eclipse.jpt.ui.internal.jpa2.details.OrphanRemoval2_0Composite; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -61,6 +62,11 @@ import org.eclipse.swt.widgets.Composite; * | | CascadeComposite | | * | | | | * | ------------------------------------------------------------------------- | + * | ------------------------------------------------------------------------- | + * | | | | + * | | OrphanRemoval2_0Composite | | + * | | | | + * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * * @see {@link JavaOneToOneMapping2_0} @@ -70,6 +76,7 @@ import org.eclipse.swt.widgets.Composite; * @see {@link FetchTypeComposite} * @see {@link OptionalComposite} * @see {@link CascadeComposite} + * @see {@link OrphanRemoval2_0Composite} */ public class JavaEclipseLinkOneToOneMapping2_0Composite<T extends JavaOneToOneMapping2_0> extends AbstractOneToOneMapping2_0Composite<T> @@ -85,21 +92,22 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite<T extends JavaOneToOneMa @Override protected void initializeLayout(Composite container) { - int groupBoxMargin = getGroupBoxMargin(); + int groupBoxMargin = this.getGroupBoxMargin(); - new TargetEntityComposite(this, addPane(container, groupBoxMargin)); - new DerivedId2_0Pane(this, buildDerivedIdHolder(), addPane(container, groupBoxMargin)); - new OneToOneJoiningStrategyPane(this, buildJoiningHolder(), container); - new FetchTypeComposite(this, addPane(container, groupBoxMargin)); - new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), addPane(container, groupBoxMargin)); - new OptionalComposite(this, addPane(container, groupBoxMargin)); - new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), addPane(container, groupBoxMargin)); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new TargetEntityComposite(this, this.addPane(container, groupBoxMargin)); + new DerivedId2_0Pane(this, this.buildDerivedIdHolder(), this.addPane(container, groupBoxMargin)); + new OneToOneJoiningStrategyPane(this, this.buildJoiningHolder(), container); + new FetchTypeComposite(this, this.addPane(container, groupBoxMargin)); + new EclipseLinkJoinFetchComposite(this, this.buildJoinFetchableHolder(), this.addPane(container, groupBoxMargin)); + new OptionalComposite(this, this.addPane(container, groupBoxMargin)); + new EclipseLinkPrivateOwnedComposite(this, this.buildPrivateOwnableHolder(), this.addPane(container, groupBoxMargin)); + new CascadeComposite(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); + new OrphanRemoval2_0Composite(this, this.addPane(container, groupBoxMargin)); } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(this.getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return ((EclipseLinkOneToOneMapping) this.subject).getJoinFetch(); @@ -108,7 +116,7 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite<T extends JavaOneToOneMa } protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnableHolder() { - return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { + return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { return ((EclipseLinkOneToOneMapping) this.subject).getPrivateOwned(); |