diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt')
8 files changed, 36 insertions, 453 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java index 6ad4889599..2c8b559099 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToManyMapping2_0Composite.java @@ -11,78 +11,17 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.java; import org.eclipse.jpt.core.context.ManyToManyMapping; import org.eclipse.jpt.core.context.ManyToManyRelationshipReference; -import org.eclipse.jpt.core.jpa2.context.java.JavaOneToManyMapping2_0; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; -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.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.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.Ordering2_0Composite; -import org.eclipse.jpt.ui.internal.jpa2.details.OrphanRemoval2_0Composite; 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 JavaEclipseLinkManyToManyMapping2_0Composite extends EclipseLinkManyToManyMappingComposite<ManyToManyMapping> { @@ -99,7 +38,7 @@ public class JavaEclipseLinkManyToManyMapping2_0Composite new TargetEntityComposite(this, container); new FetchTypeComposite(this, container); new EclipseLinkJoinFetchComposite(this, this.buildJoinFetchableHolder(), container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java index 4590675bb0..4fdab8c78c 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/java/JavaEclipseLinkManyToOneMapping2_0Composite.java @@ -10,66 +10,20 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.java; import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneMapping2_0; import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneRelationshipReference2_0; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.java.JavaEclipseLinkManyToOneMapping2_0; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; import org.eclipse.jpt.ui.WidgetFactory; -import org.eclipse.jpt.ui.internal.details.CascadeComposite; import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.ManyToOneJoiningStrategyPane; import org.eclipse.jpt.ui.internal.details.OptionalComposite; import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; import org.eclipse.jpt.ui.internal.jpa2.details.AbstractManyToOneMapping2_0Composite; +import org.eclipse.jpt.ui.internal.jpa2.details.CascadePane2_0; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | DerivedIdentity2_0Pane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | ManyToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link JavaManyToOneMapping2_0} - * @see {@link TargetEntityComposite} - * @see {@link DerivedId2_0Pane} - * @see {@link ManyToOneJoiningStrategyPane} - * @see {@link FetchTypeComposite} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - */ public class JavaEclipseLinkManyToOneMapping2_0Composite extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationshipReference2_0> { @@ -80,14 +34,15 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite super(subjectHolder, parent, widgetFactory); } - + + @Override protected void initializeManyToOneSection(Composite container) { new TargetEntityComposite(this, container); new FetchTypeComposite(this, container); new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), container); new OptionalComposite(this, container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchableHolder() { 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 index 013516660e..5270872050 100644 --- 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 @@ -12,78 +12,19 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.java; import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; import org.eclipse.jpt.core.jpa2.context.OrphanRemovable2_0; import org.eclipse.jpt.core.jpa2.context.OrphanRemovalHolder2_0; -import org.eclipse.jpt.core.jpa2.context.java.JavaOneToManyMapping2_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.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedComposite; import org.eclipse.jpt.ui.WidgetFactory; -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.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.Ordering2_0Composite; 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; -/** - * 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 extends EclipseLinkOneToManyMappingComposite<JavaOneToManyMapping> { @@ -94,7 +35,8 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite super(subjectHolder, parent, widgetFactory); } - + + @Override protected void initializeOneToManySection(Composite container) { new TargetEntityComposite(this, container); @@ -102,9 +44,9 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite new EclipseLinkJoinFetchComposite(this, this.buildJoinFetchableHolder(), container); new EclipseLinkPrivateOwnedComposite(this, this.buildPrivateOwnableHolder(), container); new OrphanRemoval2_0Composite(this, this.buildOrphanRemovableHolder(), container); - new CascadeComposite(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); + new CascadePane2_0(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); } - + @Override protected void initializeOrderingCollapsibleSection(Composite container) { new Ordering2_0Composite(this, container); 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 093c7eb3be..5c0c324f92 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 @@ -12,7 +12,6 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.java; import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.core.jpa2.context.OrphanRemovable2_0; import org.eclipse.jpt.core.jpa2.context.OrphanRemovalHolder2_0; -import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneMapping2_0; import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneRelationshipReference2_0; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToOneMapping; @@ -20,68 +19,17 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkPrivateOwned; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedComposite; import org.eclipse.jpt.ui.WidgetFactory; -import org.eclipse.jpt.ui.internal.details.CascadeComposite; import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.OneToOneJoiningStrategyPane; 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.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.OneToOneJoiningStrategy2_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; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | DerivedIdentity2_0Pane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OneToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrphanRemoval2_0Composite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link JavaOneToOneMapping2_0} - * @see {@link TargetEntityComposite} - * @see {@link DerivedId2_0Pane} - * @see {@link OneToOneJoiningStrategyPane} - * @see {@link FetchTypeComposite} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - * @see {@link OrphanRemoval2_0Composite} - */ public class JavaEclipseLinkOneToOneMapping2_0Composite extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationshipReference2_0> { @@ -101,7 +49,7 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite new OptionalComposite(this, container); new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), container); new OrphanRemoval2_0Composite(this, buildOrphanRemovableHolder(), container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java index a3a6624004..1b2dd93a15 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToManyMapping2_0Composite.java @@ -9,80 +9,31 @@ ******************************************************************************/ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.orm; -import org.eclipse.jpt.core.context.ManyToManyMapping; import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.details.AccessTypeComposite; -import org.eclipse.jpt.ui.internal.details.CascadeComposite; import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.ManyToManyJoiningStrategyPane; -import org.eclipse.jpt.ui.internal.details.OrderingComposite; import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; import org.eclipse.jpt.ui.internal.details.orm.OrmMappingNameChooser; +import org.eclipse.jpt.ui.internal.jpa2.details.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.Ordering2_0Composite; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | JoiningStrategyComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link ManyToManyMapping} - * @see {@link TargetEntityComposite} - * @see {@link ManyToManyJoiningStrategyPane} - * @see {@link FetchTypeComposite} - * @see {@link CascadeComposite} - * @see {@link OrderingComposite} - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkManyToManyMapping2_0Composite extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping> { - /** - * Creates a new <code>ManyToManyMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToManyMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkManyToManyMapping2_0Composite(PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - + public OrmEclipseLinkManyToManyMapping2_0Composite( + PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + super(subjectHolder, parent, widgetFactory); } - + + @Override protected void initializeManyToManySection(Composite container) { new TargetEntityComposite(this, container); @@ -90,9 +41,9 @@ public class OrmEclipseLinkManyToManyMapping2_0Composite new AccessTypeComposite(this, buildAccessHolderHolder(), container); new FetchTypeComposite(this, container); new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } - + @Override protected void initializeOrderingCollapsibleSection(Composite container) { new Ordering2_0Composite(this, container); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java index fd8478ee55..70140c210e 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkManyToOneMapping2_0Composite.java @@ -11,68 +11,22 @@ package org.eclipse.jpt.eclipselink.ui.internal.v2_0.details.orm; import org.eclipse.jpt.core.context.AccessHolder; import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping; -import org.eclipse.jpt.core.jpa2.context.java.JavaManyToOneMapping2_0; import org.eclipse.jpt.core.jpa2.context.orm.OrmManyToOneRelationshipReference2_0; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.internal.v2_0.context.orm.OrmEclipseLinkManyToOneMapping2_0; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchComposite; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.details.AccessTypeComposite; -import org.eclipse.jpt.ui.internal.details.CascadeComposite; import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.ManyToOneJoiningStrategyPane; import org.eclipse.jpt.ui.internal.details.OptionalComposite; import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; import org.eclipse.jpt.ui.internal.details.orm.OrmMappingNameChooser; import org.eclipse.jpt.ui.internal.jpa2.details.AbstractManyToOneMapping2_0Composite; +import org.eclipse.jpt.ui.internal.jpa2.details.CascadePane2_0; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | DerivedIdentity2_0Pane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | ManyToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link JavaManyToOneMapping2_0} - * @see {@link TargetEntityComposite} - * @see {@link DerivedId2_0Pane} - * @see {@link ManyToOneJoiningStrategyPane} - * @see {@link FetchTypeComposite} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - */ public class OrmEclipseLinkManyToOneMapping2_0Composite extends AbstractManyToOneMapping2_0Composite<OrmManyToOneMapping, OrmManyToOneRelationshipReference2_0> { @@ -84,6 +38,7 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite super(subjectHolder, parent, widgetFactory); } + @Override protected void initializeManyToOneSection(Composite container) { new TargetEntityComposite(this, container); @@ -92,7 +47,7 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite new FetchTypeComposite(this, container); new EclipseLinkJoinFetchComposite(this, buildJoinFetchableHolder(), container); new OptionalComposite(this, container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java index 2a0a85e245..2a173afd46 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToManyMapping2_0Composite.java @@ -15,16 +15,14 @@ import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.core.jpa2.context.OrphanRemovable2_0; import org.eclipse.jpt.core.jpa2.context.OrphanRemovalHolder2_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.EclipseLinkOneToManyMappingComposite; import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedComposite; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.details.AccessTypeComposite; -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.details.orm.OrmMappingNameChooser; +import org.eclipse.jpt.ui.internal.jpa2.details.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.Ordering2_0Composite; import org.eclipse.jpt.ui.internal.jpa2.details.OrphanRemoval2_0Composite; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -32,68 +30,6 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkOneToManyJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | AccessTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkJoinFetchComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkPrivateOwnedComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrphanRemoval2_0Composite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see OneToManyMapping - * @see TargetEntityComposite - * @see EclipseLinkOneToManyJoiningStrategyPane - * @see AccessTypeComposite - * @see FetchTypeComposite - * @see EclipseLinkJoinFetchComposite - * @see EclipseLinkPrivateOwnedComposite - * @see OrphanRemoval2_0Composite - * @see CascadeComposite - * @see OrderingComposite - */ public class OrmEclipseLinkOneToManyMapping2_0Composite extends EclipseLinkOneToManyMappingComposite<OrmOneToManyMapping> { @@ -101,9 +37,11 @@ public class OrmEclipseLinkOneToManyMapping2_0Composite PropertyValueModel<? extends OrmOneToManyMapping> subjectHolder, Composite parent, WidgetFactory widgetFactory) { + super(subjectHolder, parent, widgetFactory); } - + + @Override protected void initializeOneToManySection(Composite container) { new TargetEntityComposite(this, container); @@ -113,9 +51,9 @@ public class OrmEclipseLinkOneToManyMapping2_0Composite new EclipseLinkJoinFetchComposite(this, this.buildJoinFetchableHolder(), container); new EclipseLinkPrivateOwnedComposite(this, this.buildPrivateOwnableHolder(), container); new OrphanRemoval2_0Composite(this, this.buildOrphanRemovableHolder(), container); - new CascadeComposite(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); + new CascadePane2_0(this, this.buildCascadeHolder(), this.addSubPane(container, 5)); } - + @Override protected void initializeOrderingCollapsibleSection(Composite container) { new Ordering2_0Composite(this, container); diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java index a0773a775b..3e799fc8a3 100644 --- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/orm/OrmEclipseLinkOneToOneMapping2_0Composite.java @@ -13,7 +13,6 @@ import org.eclipse.jpt.core.context.AccessHolder; import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.core.jpa2.context.OrphanRemovable2_0; import org.eclipse.jpt.core.jpa2.context.OrphanRemovalHolder2_0; -import org.eclipse.jpt.core.jpa2.context.java.JavaOneToOneMapping2_0; import org.eclipse.jpt.core.jpa2.context.orm.OrmOneToOneRelationshipReference2_0; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkJoinFetch; import org.eclipse.jpt.eclipselink.core.context.EclipseLinkOneToOneMapping; @@ -22,63 +21,18 @@ import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkJoinFetchCompo import org.eclipse.jpt.eclipselink.ui.internal.details.EclipseLinkPrivateOwnedComposite; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.details.AccessTypeComposite; -import org.eclipse.jpt.ui.internal.details.CascadeComposite; import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.OneToOneJoiningStrategyPane; import org.eclipse.jpt.ui.internal.details.OptionalComposite; import org.eclipse.jpt.ui.internal.details.TargetEntityComposite; import org.eclipse.jpt.ui.internal.details.orm.OrmMappingNameChooser; import org.eclipse.jpt.ui.internal.jpa2.details.AbstractOneToOneMapping2_0Composite; +import org.eclipse.jpt.ui.internal.jpa2.details.CascadePane2_0; import org.eclipse.jpt.ui.internal.jpa2.details.OneToOneJoiningStrategy2_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; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | DerivedIdentity2_0Pane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OneToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link JavaOneToOneMapping2_0} - * @see {@link TargetEntityComposite} - * @see {@link DerivedId2_0Pane} - * @see {@link OneToOneJoiningStrategyPane} - * @see {@link FetchTypeComposite} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - */ public class OrmEclipseLinkOneToOneMapping2_0Composite extends AbstractOneToOneMapping2_0Composite<OrmOneToOneMapping, OrmOneToOneRelationshipReference2_0> { @@ -90,6 +44,7 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite super(subjectHolder, parent, widgetFactory); } + @Override protected void initializeOneToOneSection(Composite container) { new TargetEntityComposite(this, container); @@ -100,9 +55,9 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite new OptionalComposite(this, container); new EclipseLinkPrivateOwnedComposite(this, buildPrivateOwnableHolder(), container); new OrphanRemoval2_0Composite(this, buildOrphanRemovableHolder(), container); - new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5)); + new CascadePane2_0(this, buildCascadeHolder(), addSubPane(container, 5)); } - + @Override protected void initializeJoiningStrategyCollapsibleSection(Composite container) { new OneToOneJoiningStrategy2_0Pane(this, buildJoiningHolder(), container); |