diff options
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java | 7 | ||||
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java | 3 | ||||
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaOneToOneMappingComposite.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneMappingComposite.java) | 11 | ||||
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategyPane2_0.java | 10 |
4 files changed, 9 insertions, 22 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java index c334e972cb..a2bdd0fa84 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java @@ -40,13 +40,6 @@ import org.eclipse.ui.forms.widgets.Section; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see {@link OneToOneMapping} - * @see {@link OneToOneRelationship} - * @see {@link OneToOneMappingComposite} - * @see {@link MappedByStrategyPane} - * @see {@link JoinColumnStrategyPane} - * @see {@link PrimaryKeyJoinColumnStrategyPane} - * * @version 2.3 * @since 2.1 */ 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 6d47f25384..c828c1fd7b 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 @@ -30,7 +30,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; -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.swt.widgets.Composite; @@ -130,7 +129,7 @@ public abstract class AbstractJavaUiFactory Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return new OneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + return new JavaOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createManyToManyMappingComposite( 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/java/JavaOneToOneMappingComposite.java index 8eb96bf6d5..5d7b7a5c05 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/java/JavaOneToOneMappingComposite.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.jpa.ui.internal.details; +package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; @@ -16,15 +16,20 @@ 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.jpt.jpa.ui.details.JptJpaUiDetailsMessages; +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.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 OneToOneMappingComposite +public class JavaOneToOneMappingComposite extends AbstractOneToOneMappingComposite<OneToOneMapping, OneToOneRelationship, Cascade> { - public OneToOneMappingComposite( + public JavaOneToOneMappingComposite( PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, Composite parentComposite, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategyPane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategyPane2_0.java index 999289342c..6214e0eaa9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategyPane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategyPane2_0.java @@ -11,14 +11,11 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.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.OneToOneMapping; -import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_0; import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.JoinTableJoiningStrategyPane; import org.eclipse.jpt.jpa.ui.internal.details.MappedByJoiningStrategyPane; -import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingComposite; import org.eclipse.jpt.jpa.ui.internal.details.PrimaryKeyJoinColumnJoiningStrategyPane; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -51,13 +48,6 @@ import org.eclipse.ui.forms.widgets.Section; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see {@link OneToOneMapping} - * @see {@link OneToOneRelationship} - * @see {@link OneToOneMappingComposite} - * @see {@link MappedByStrategyPane} - * @see {@link JoinColumnStrategyPane} - * @see {@link PrimaryKeyJoinColumnStrategyPane} - * * @version 2.3 * @since 2.1 */ |