diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToOneMapping2_0Composite.java | 24 |
1 files changed, 7 insertions, 17 deletions
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); } } |