diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org')
150 files changed, 1788 insertions, 3181 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java index 73c5624d43..c2a01a12bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLink2_4ProjectFlagModel.java @@ -21,13 +21,13 @@ import org.eclipse.jpt.jpa.eclipselink.core.internal.EclipseLinkJpaPlatformFacto public class EclipseLink2_4ProjectFlagModel<T extends JpaNode> extends TransformationPropertyValueModel<T, Boolean> { - public EclipseLink2_4ProjectFlagModel(PropertyValueModel<T> jpaProjectModel) { + public EclipseLink2_4ProjectFlagModel(PropertyValueModel<? extends T> jpaProjectModel) { super(jpaProjectModel); } @Override - protected Boolean transform_(T value) { - EclipseLinkJpaPlatformVersion jpaVersion = (EclipseLinkJpaPlatformVersion) value.getJpaPlatform().getJpaVersion(); + protected Boolean transform_(T jpaModel) { + EclipseLinkJpaPlatformVersion jpaVersion = (EclipseLinkJpaPlatformVersion) jpaModel.getJpaPlatform().getJpaVersion(); return Boolean.valueOf(jpaVersion.isCompatibleWithEclipseLinkVersion(EclipseLink2_4JpaPlatformFactory.VERSION)); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java index 330ebfc3f6..e62ce588b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkArrayMapping2_3Composite.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. @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,19 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkArrayMapping2_3; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkArrayMapping2_3Composite extends Pane<EclipseLinkArrayMapping2_3> - implements JpaComposite +public class EclipseLinkArrayMapping2_3Composite + extends Pane<EclipseLinkArrayMapping2_3> + implements JpaComposite { - public EclipseLinkArrayMapping2_3Composite(PropertyValueModel<? extends EclipseLinkArrayMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkArrayMapping2_3Composite( + PropertyValueModel<? extends EclipseLinkArrayMapping2_3> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java index 85aefe3587..1390c5650c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicCollectionMappingComposite.java @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicCollectionMa import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -/** - * - * @version 2.1 - * @since 2.1 - */ -public class EclipseLinkBasicCollectionMappingComposite extends Pane<EclipseLinkBasicCollectionMapping> - implements JpaComposite +public class EclipseLinkBasicCollectionMappingComposite + extends Pane<EclipseLinkBasicCollectionMapping> + implements JpaComposite { - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkBasicCollectionMappingComposite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkBasicCollectionMappingComposite( + PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java index 86c4e89cd3..acc010a4d4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMapMappingComposite.java @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -/** - * - * @version 2.1 - * @since 2.1 - */ -public class EclipseLinkBasicMapMappingComposite extends Pane<EclipseLinkBasicMapMapping> - implements JpaComposite +public class EclipseLinkBasicMapMappingComposite + extends Pane<EclipseLinkBasicMapMapping> + implements JpaComposite { - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkBasicMapMappingComposite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkBasicMapMappingComposite( + PropertyValueModel<? extends EclipseLinkBasicMapMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } 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 b87f40d26c..5f655e563e 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 @@ -9,24 +9,23 @@ ******************************************************************************/ 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.CompositeBooleanPropertyValueModel; 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.internal.transformer.NotNullObjectTransformer; 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.BaseEnumeratedConverter; import org.eclipse.jpt.jpa.core.context.LobConverter; -import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkBasicMapping; 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; import org.eclipse.jpt.jpa.ui.internal.details.AbstractBasicMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite; import org.eclipse.jpt.jpa.ui.internal.details.EnumTypeComboViewer; -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.TemporalTypeCombo; import org.eclipse.swt.layout.GridData; @@ -39,73 +38,16 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | ColumnComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | TemporalTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EnumTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | MutableComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | LobComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see BasicMapping - * @see ColumnComposite - * @see EnumTypeComboViewer - * @see FetchTypeComboViewer - * @see LobComposite - * @see OptionalComposite - * @see TemporalTypeCombo - * - * @version 3.2 - * @since 2.1 - */ -public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> extends AbstractBasicMappingComposite<T> +public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> + extends AbstractBasicMappingComposite<T> { - /** - * Creates a new <code>BasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IBasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - protected EclipseLinkBasicMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + protected EclipseLinkBasicMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @@ -136,7 +78,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e JptUiDetailsMessages.TypeSection_temporal, buildConverterBooleanHolder(BaseTemporalConverter.class), null); - registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory())); + new TemporalTypeCombo(this, buildTemporalConverterHolder(converterHolder), container); // Enumerated @@ -145,7 +87,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e JptUiDetailsMessages.TypeSection_enumerated, buildConverterBooleanHolder(BaseEnumeratedConverter.class), null); - registerSubPane(new EnumTypeComboViewer(buildEnumeratedConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory())); + new EnumTypeComboViewer(this, this.buildEnumeratedConverterHolder(converterHolder), container); // EclipseLink Converter Button elConverterButton = addRadioButton( @@ -155,13 +97,13 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e null); ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); + PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder); + PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel); Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); GridData gridData = new GridData(); gridData.horizontalIndent = 20; convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); + new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container); return container; } @@ -175,22 +117,12 @@ public abstract class EclipseLinkBasicMappingComposite<T extends BasicMapping> e }; } - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null; - } - }; + protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) { + return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER); } - protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) { - return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) { - @Override - protected Boolean transform(EclipseLinkConvert value) { - return Boolean.valueOf(value != null); - } - }; + protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) { + return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance()); } protected void initializeConvertersCollapsibleSection(Composite container) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java index 161e43cd98..d24b6d901e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java @@ -10,53 +10,59 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import java.util.Set; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; 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.eclipselink.core.context.EclipseLinkConversionValue; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkObjectTypeConverter; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -/** - * Clients can use this dialog to prompt the user for SecondaryTable settings. - * Use the following once the dialog is closed: - * @see #getSelectedTable() - * @see #getSelectedCatalog() - * @see #getSelectedSchema() - * @version 2.1 - * @since 2.1 - */ -public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLinkConversionValueStateObject> { - +public class EclipseLinkConversionValueDialog + extends ValidatingDialog<EclipseLinkConversionValueStateObject> +{ + private final EclipseLinkObjectTypeConverter objectTypeConverter; + /** - * when creating a new EclipseLinkConversionValue, 'conversionValue' will be null + * This will be <code>null</code> when creating a new conversion value. */ private final EclipseLinkConversionValue conversionValue; - private EclipseLinkObjectTypeConverter objectTypeConverter; - - // ********** constructors ********** /** - * Use this constructor to create a new conversion value + * Use this constructor to create a <em>new</em> conversion value. */ - public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter) { - this(parent,objectTypeConverter, null); + public EclipseLinkConversionValueDialog( + Shell parentShell, + ResourceManager resourceManager, + EclipseLinkObjectTypeConverter objectTypeConverter) { + this(parentShell, resourceManager, objectTypeConverter, null); } /** - * Use this constructor to edit an existing conversion value + * Use this constructor to edit an <em>existing</em> conversion value. */ - public EclipseLinkConversionValueDialog(Shell parent, EclipseLinkObjectTypeConverter objectTypeConverter, EclipseLinkConversionValue conversionValue) { - super(parent); + public EclipseLinkConversionValueDialog( + Shell parentShell, + ResourceManager resourceManager, + EclipseLinkObjectTypeConverter objectTypeConverter, + EclipseLinkConversionValue conversionValue) { + super(parentShell, resourceManager, buildTitle(conversionValue)); this.objectTypeConverter = objectTypeConverter; this.conversionValue = conversionValue; } + private static String buildTitle(EclipseLinkConversionValue conversionValue) { + return (conversionValue == null) ? + EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValue : + EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValue; + } + @Override protected EclipseLinkConversionValueStateObject buildStateObject() { String dataValue = null; @@ -77,48 +83,34 @@ public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLi // ********** open ********** @Override - protected void configureShell(Shell shell) { - super.configureShell(shell); - shell.setText(this.getTitle()); - } - - @Override - protected String getTitle() { - return (this.isAddDialog()) ? - EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValue - : - EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValue; - } - - @Override protected String getDescriptionTitle() { return (this.isAddDialog()) ? - EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle - : + EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescriptionTitle : EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValueDescriptionTitle; } @Override protected String getDescription() { return (this.isAddDialog()) ? - EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescription - : + EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_addConversionValueDescription : EclipseLinkUiDetailsMessages.EclipseLinkConversionValueDialog_editConversionValueDescription; } @Override protected DialogPane<EclipseLinkConversionValueStateObject> buildLayout(Composite container) { - return new ConversionValueDialogPane(container); + return new ConversionValueDialogPane(this.getSubjectHolder(), container, this.resourceManager); } @Override public void create() { super.create(); + this.getPane().selectAll(); + this.getButton(OK).setEnabled(false); + } - ConversionValueDialogPane pane = (ConversionValueDialogPane) getPane(); - pane.selectAll(); - - getButton(OK).setEnabled(false); + @Override + protected ConversionValueDialogPane getPane() { + return (ConversionValueDialogPane) super.getPane(); } @@ -149,13 +141,18 @@ public class EclipseLinkConversionValueDialog extends ValidatingDialog<EclipseLi return getSubject().getObjectValue(); } - private class ConversionValueDialogPane extends DialogPane<EclipseLinkConversionValueStateObject> { - + + static class ConversionValueDialogPane + extends DialogPane<EclipseLinkConversionValueStateObject> + { private Text dataValueText; private Text objectValueText; - ConversionValueDialogPane(Composite parent) { - super(EclipseLinkConversionValueDialog.this.getSubjectHolder(), parent); + ConversionValueDialogPane( + PropertyValueModel<EclipseLinkConversionValueStateObject> subjectModel, + Composite parentComposite, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java index add473aa37..994604ac50 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueStateObject.java @@ -21,11 +21,6 @@ import org.eclipse.jpt.common.utility.node.Problem; /** * This is the state object used by the <code>NewNameDialog</code>, which stores * the current name and validates it when it is modified. - * - * @see NewNameDialog - * - * @version 2.1 - * @since 2.1 */ @SuppressWarnings("nls") final class EclipseLinkConversionValueStateObject extends AbstractNode diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java index b69bb8eda4..1f34316524 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import java.util.ArrayList; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.util.SWTUtil; import org.eclipse.jpt.common.ui.internal.widgets.Pane; @@ -39,21 +38,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | -------------------------------------------------------------- | - * | Enum Type: | |v| | - * | -------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see EclipseLinkConvert - * @see EclipseLinkBasicMappingComposite - A container of this widget - * - * @version 2.1 - * @since 2.1 - */ public class EclipseLinkConvertCombo extends Pane<EclipseLinkConvert> { @@ -70,15 +54,13 @@ public class EclipseLinkConvertCombo protected static String DEFAULT_KEY = "?!#!?#?#?default?#?!#?!#?"; //$NON-NLS-1$ - /** - * Creates a new <code>EclipseLinkConvertComposite</code>. - */ - public EclipseLinkConvertCombo(PropertyValueModel<? extends EclipseLinkConvert> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkConvertCombo( + Pane<?> parentPane, + PropertyValueModel<? extends EclipseLinkConvert> subjectModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite + ) { + super(parentPane, subjectModel, enabledModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java index c137d0c926..ed34d3ee26 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertersComposite.java @@ -124,48 +124,28 @@ public class EclipseLinkConvertersComposite extends Pane<EclipseLinkConverterCon protected EclipseLinkCustomConverterComposite getCustomConverterComposite(PageBook pageBook) { if (this.converterComposite == null) { - this.converterComposite = new EclipseLinkCustomConverterComposite( - buildSelectedCustomConverterModel(), - pageBook, - getWidgetFactory() - ); - registerSubPane(this.converterComposite); + this.converterComposite = new EclipseLinkCustomConverterComposite(this, this.buildSelectedCustomConverterModel(), pageBook); } return this.converterComposite; } protected EclipseLinkObjectTypeConverterComposite getObjectTypeConverterComposite(PageBook pageBook) { if (this.objectTypeConverterComposite == null) { - this.objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite( - buildSelectedObjectTypeConverterModel(), - pageBook, - getWidgetFactory() - ); - registerSubPane(this.objectTypeConverterComposite); + this.objectTypeConverterComposite = new EclipseLinkObjectTypeConverterComposite(this, this.buildSelectedObjectTypeConverterModel(), pageBook); } return this.objectTypeConverterComposite; } protected EclipseLinkStructConverterComposite getStructConverterComposite(PageBook pageBook) { if (this.structConverterComposite == null) { - this.structConverterComposite = new EclipseLinkStructConverterComposite( - buildSelectedStructConverterModel(), - pageBook, - getWidgetFactory() - ); - registerSubPane(this.structConverterComposite); + this.structConverterComposite = new EclipseLinkStructConverterComposite(this, this.buildSelectedStructConverterModel(), pageBook); } return this.structConverterComposite; } protected EclipseLinkTypeConverterComposite getTypeConverterComposite(PageBook pageBook) { if (this.typeConverterComposite == null) { - this.typeConverterComposite = new EclipseLinkTypeConverterComposite( - buildSelectedTypeConverterModel(), - pageBook, - getWidgetFactory() - ); - registerSubPane(this.typeConverterComposite); + this.typeConverterComposite = new EclipseLinkTypeConverterComposite(this, this.buildSelectedTypeConverterModel(), pageBook); } return this.typeConverterComposite; } @@ -225,7 +205,7 @@ public class EclipseLinkConvertersComposite extends Pane<EclipseLinkConverterCon } protected EclipseLinkConverterDialog buildEclipseLinkConverterDialog() { - return new EclipseLinkConverterDialog(this.getShell(), this.getSubject()); + return new EclipseLinkConverterDialog(this.getShell(), this.getResourceManager(), this.getSubject()); } protected EclipseLinkConverter addEclipseLinkConverterFromDialog(EclipseLinkConverterDialog dialog) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java index ca9cfcb18f..04c7f7591e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java @@ -38,20 +38,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @version 2.1 * @since 2.1 */ -public class EclipseLinkCustomConverterComposite extends Pane<EclipseLinkCustomConverter> +public class EclipseLinkCustomConverterComposite + extends Pane<EclipseLinkCustomConverter> { - - /** - * Creates a new <code>ConverterComposite</code>. - * - * @param parentPane The parent container of this one - * @param parent The parent container - */ - public EclipseLinkCustomConverterComposite(PropertyValueModel<? extends EclipseLinkCustomConverter> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public EclipseLinkCustomConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkCustomConverter> subjectModel, Composite parentComposite) { + super(parentPane, subjectModel, parentComposite); } @Override 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 ce1e1d939d..82064dbfe3 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 @@ -9,18 +9,25 @@ ******************************************************************************/ 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.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.common.utility.internal.transformer.NotNullObjectTransformer; +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; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.AbstractElementCollectionMapping2_0Composite; import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.events.ExpansionAdapter; import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; @@ -29,13 +36,13 @@ import org.eclipse.ui.forms.widgets.Section; public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends ElementCollectionMapping2_0> extends AbstractElementCollectionMapping2_0Composite<T> { - - protected EclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + protected EclipseLinkElementCollectionMapping2_0Composite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -74,13 +81,60 @@ public abstract class EclipseLinkElementCollectionMapping2_0Composite<T extends }; } - protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) { - return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) { + @Override + protected Composite buildBasicValueTypeSectionClient(Section section) { + Composite container = super.buildBasicValueTypeSectionClient(section); + PropertyValueModel<Converter> converterHolder = buildConverterModel(); + + // EclipseLink Converter + Button elConverterButton = addRadioButton( + container, + EclipseLinkUiDetailsMessages.TypeSection_converted, + buildConverterBooleanHolder(EclipseLinkConvert.class), + null); + ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; + + PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder); + PropertyValueModel<Boolean> convertEnabledModel = this.buildNotNullModel(convertModel); + Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); + GridData gridData = new GridData(); + gridData.horizontalIndent = 20; + convertLabel.setLayoutData(gridData); + new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container); + + return container; + } + + protected PropertyValueModel<Converter> buildConverterModel() { + return new PropertyAspectAdapter<ConvertibleMapping, Converter>(this.getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override - protected Boolean transform(EclipseLinkConvert value) { - return Boolean.valueOf(value != null); + protected Converter buildValue_() { + return this.subject.getConverter(); } }; } + protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { + return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter = this.subject.getConverter(); + return Boolean.valueOf(converter.getType() == converterType); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setConverter(converterType); + } + } + }; + } + protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) { + return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER); + } + + protected <M> PropertyValueModel<Boolean> buildNotNullModel(PropertyValueModel<M> valueModel) { + return new TransformationPropertyValueModel<M, Boolean>(valueModel, NotNullObjectTransformer.<M>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/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java index df5032aba0..db6157a08a 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 @@ -9,14 +9,15 @@ ******************************************************************************/ 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.CompositeBooleanPropertyValueModel; 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.internal.transformer.NotNullObjectTransformer; 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.core.context.BaseTemporalConverter; 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; @@ -39,12 +40,12 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> extends AbstractIdMappingComposite<T> { protected EclipseLinkIdMappingComposite( - PropertyValueModel<? extends T> subjectHolder, + PropertyValueModel<? extends T> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -76,7 +77,7 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> JptUiDetailsMessages.TypeSection_temporal, buildConverterBooleanHolder(BaseTemporalConverter.class), null); - registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory())); + new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container); // EclipseLink Converter Button elConverterButton = addRadioButton( @@ -86,35 +87,25 @@ public abstract class EclipseLinkIdMappingComposite<T extends IdMapping> null); ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); + PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder); + PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel); Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); GridData gridData = new GridData(); gridData.horizontalIndent = 20; convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); + new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container); return container; } - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null; - } - }; + protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) { + return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER); } - protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) { - return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) { - @Override - protected Boolean transform(EclipseLinkConvert value) { - return Boolean.valueOf(value != null); - } - }; + protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) { + return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance()); } - + protected PropertyValueModel<EclipseLinkMutable> buildMutableHolder() { return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { @Override 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 5e2b62f5ab..6311096c01 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 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,6 +9,7 @@ ******************************************************************************/ 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; @@ -18,13 +19,10 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContaine 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.EclipseLinkRelationshipMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; 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.ManyToManyJoiningStrategyPane; -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; @@ -35,64 +33,16 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | JoiningStrategyComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link ManyToManyMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToManyJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link CascadeComposite} - * @see {@link OrderingComposite} - * - * @version 2.3 - * @since 2.1 - */ -public class EclipseLinkManyToManyMappingComposite<T extends ManyToManyMapping> +public class EclipseLinkManyToManyMappingComposite<T extends ManyToManyMapping> extends AbstractManyToManyMappingComposite<T, ManyToManyRelationship> - implements JpaComposite { - /** - * 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 EclipseLinkManyToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkManyToManyMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 e6958b9254..80617dfac7 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2011 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,6 +9,7 @@ ******************************************************************************/ 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; @@ -58,33 +59,17 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * | | | | * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> - * - * @see {@link ManyToOneMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToOneJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - * - * @version 2.3 - * @since 2.1 */ public class EclipseLinkManyToOneMappingComposite<T extends ManyToOneMapping> extends AbstractManyToOneMappingComposite<T, ManyToOneRelationship> { - /** - * Creates a new <code>EclipseLinkManyToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkManyToOneMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkManyToOneMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java index df489b30b5..614abef11f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java @@ -229,14 +229,14 @@ public class EclipseLinkMultitenancyComposite extends Pane<EclipseLinkMultitenan }; } - //TODO do i need to pass in the PaneEnabler from *this* pane as a Combined property value model? protected TenantDiscriminatorColumnsComposite<EclipseLinkMultitenancy2_3> buildTenantDiscriminatorColumnsComposite(Composite container) { return new TenantDiscriminatorColumnsComposite<EclipseLinkMultitenancy2_3>( - getSubjectHolder(), - new TenantDiscriminatorColumnPaneEnablerHolder(), - container, - getWidgetFactory(), - buildTenantDiscriminatorColumnsEditor()); + this, + this.getSubjectHolder(), + new TenantDiscriminatorColumnPaneEnablerHolder(), + container, + this.buildTenantDiscriminatorColumnsEditor() + ); } protected TenantDiscriminatorColumnsEditor<EclipseLinkMultitenancy2_3> buildTenantDiscriminatorColumnsEditor() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java index e81e78ccdf..8f67ff8eb7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java @@ -14,7 +14,6 @@ import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.swt.ColumnAdapter; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveTablePane; @@ -59,20 +58,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @version 2.1 * @since 2.1 */ -public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObjectTypeConverter> +public class EclipseLinkObjectTypeConverterComposite + extends Pane<EclipseLinkObjectTypeConverter> { - - /** - * Creates a new <code>ObjectTypeConverterComposite</code>. - * - * @param parentPane The parent container of this one - * @param parent The parent container - */ - public EclipseLinkObjectTypeConverterComposite(PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public EclipseLinkObjectTypeConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkObjectTypeConverter> subjectModel, Composite parentComposite) { + super(parentPane, subjectModel, parentComposite); } @Override @@ -282,7 +272,7 @@ public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObj @Override public void optionOnSelection(CollectionValueModel<EclipseLinkConversionValue> selectedItemsModel) { EclipseLinkConversionValue conversionValue = selectedItemsModel.iterator().next(); - EclipseLinkConversionValueDialog dialog = new EclipseLinkConversionValueDialog(getShell(), getSubject(), conversionValue); + EclipseLinkConversionValueDialog dialog = new EclipseLinkConversionValueDialog(getShell(), getResourceManager(), getSubject(), conversionValue); editConversionValueFromDialog(dialog, conversionValue); } @@ -303,7 +293,7 @@ public class EclipseLinkObjectTypeConverterComposite extends Pane<EclipseLinkObj protected EclipseLinkConversionValueDialog buildConversionValueDialogForAdd() { - return new EclipseLinkConversionValueDialog(getShell(), getSubject()); + return new EclipseLinkConversionValueDialog(this.getShell(), this.getResourceManager(), this.getSubject()); } protected EclipseLinkConversionValue addConversionValueFromDialog(EclipseLinkConversionValueDialog dialog) { 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 21792ed847..304fc10409 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 @@ -9,6 +9,7 @@ ******************************************************************************/ 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; @@ -35,76 +36,16 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | TargetEntityComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkOneToManyJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkJoinFetchComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkvateOwnedComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see OneToOneMapping - * @see CascadeComposite - * @see EclipseLinkJoinFetchComboViewer - * @see EclipseLinkJoinFetchComboViewer - * @see EclipseLinkOneToManyJoiningStrategyPane - * @see FetchTypeComboViewer - * @see OrderingComposite - * @see TargetEntityClassChooser - * - * @version 2.3 - * @since 2.1 - */ public class EclipseLinkOneToManyMappingComposite<T extends OneToManyMapping> extends AbstractOneToManyMappingComposite<T, EclipseLinkOneToManyRelationship> - implements JpaComposite { - /** - * Creates a new <code>EclipselinkOneToManyMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IOneToManyMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkOneToManyMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkOneToManyMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 d2a899234a..43b5677692 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 @@ -9,6 +9,7 @@ ******************************************************************************/ 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; @@ -32,21 +33,14 @@ import org.eclipse.ui.forms.widgets.Hyperlink; public class EclipseLinkOneToOneMappingComposite<T extends OneToOneMapping> extends AbstractOneToOneMappingComposite<T, OneToOneRelationship> - implements JpaComposite { - /** - * Creates a new <code>EclipselinkOneToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkOneToOneMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkOneToOneMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java index e58fccf90f..66db9ed42b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; @@ -38,20 +37,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @version 2.1 * @since 2.1 */ -public class EclipseLinkStructConverterComposite extends Pane<EclipseLinkStructConverter> +public class EclipseLinkStructConverterComposite + extends Pane<EclipseLinkStructConverter> { - - /** - * Creates a new <code>StructConverterComposite</code>. - * - * @param parentPane The parent container of this one - * @param parent The parent container - */ - public EclipseLinkStructConverterComposite(PropertyValueModel<? extends EclipseLinkStructConverter> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public EclipseLinkStructConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkStructConverter> subjectModel, Composite parentComposite) { + super(parentPane, subjectModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java index b5d1cb791f..b807d468f6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructureMapping2_3Composite.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. @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,19 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkStructureMapping2 import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkStructureMapping2_3Composite extends Pane<EclipseLinkStructureMapping2_3> - implements JpaComposite +public class EclipseLinkStructureMapping2_3Composite + extends Pane<EclipseLinkStructureMapping2_3> + implements JpaComposite { - public EclipseLinkStructureMapping2_3Composite(PropertyValueModel<? extends EclipseLinkStructureMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkStructureMapping2_3Composite( + PropertyValueModel<? extends EclipseLinkStructureMapping2_3> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java index 1735c412dd..f5982febcc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTransformationMappingComposite.java @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkTransformationMap import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -/** - * - * @version 2.1 - * @since 2.1 - */ -public class EclipseLinkTransformationMappingComposite extends Pane<EclipseLinkTransformationMapping> - implements JpaComposite +public class EclipseLinkTransformationMappingComposite + extends Pane<EclipseLinkTransformationMapping> + implements JpaComposite { - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkTransformationMappingComposite(PropertyValueModel<? extends EclipseLinkTransformationMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkTransformationMappingComposite( + PropertyValueModel<? extends EclipseLinkTransformationMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java index 3f8947837b..b1b4a645e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; @@ -37,20 +36,11 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @version 2.1 * @since 2.1 */ -public class EclipseLinkTypeConverterComposite extends Pane<EclipseLinkTypeConverter> +public class EclipseLinkTypeConverterComposite + extends Pane<EclipseLinkTypeConverter> { - - /** - * Creates a new <code>TypeConverterComposite</code>. - * - * @param parentPane The parent container of this one - * @param parent The parent container - */ - public EclipseLinkTypeConverterComposite(PropertyValueModel<? extends EclipseLinkTypeConverter> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public EclipseLinkTypeConverterComposite(Pane<?> parentPane, PropertyValueModel<? extends EclipseLinkTypeConverter> subjectModel, Composite parentComposite) { + super(parentPane, subjectModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java index fb31567490..14936aeb9f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVariableOneToOneMappingComposite.java @@ -9,6 +9,7 @@ ******************************************************************************/ 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.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -16,31 +17,21 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkVariableOneToOneM import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -/** - * - * @version 2.2 - * @since 2.2 - */ -public class EclipseLinkVariableOneToOneMappingComposite extends Pane<EclipseLinkVariableOneToOneMapping> - implements JpaComposite +public class EclipseLinkVariableOneToOneMappingComposite + extends Pane<EclipseLinkVariableOneToOneMapping> + implements JpaComposite { - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkVariableOneToOneMappingComposite(PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public EclipseLinkVariableOneToOneMappingComposite( + PropertyValueModel<? extends EclipseLinkVariableOneToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - + // NOP } } 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 45bbc78d33..1202ce3311 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 @@ -9,14 +9,15 @@ ******************************************************************************/ 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.CompositeBooleanPropertyValueModel; 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.internal.transformer.NotNullObjectTransformer; 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.BaseTemporalConverter; 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; @@ -56,30 +57,17 @@ import org.eclipse.ui.forms.widgets.Section; * | | | | * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> - * - * @see VersionMapping - * @see ColumnComposite - * @see TemporalTypeCombo - * - * @version 3.2 - * @since 2.1 */ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMapping> extends AbstractVersionMappingComposite<T> { - /** - * Creates a new <code>VersionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IVersionMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - protected EclipseLinkVersionMappingComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + protected EclipseLinkVersionMappingComposite( + PropertyValueModel<? extends T> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -111,7 +99,7 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin JptUiDetailsMessages.TypeSection_temporal, buildConverterBooleanHolder(BaseTemporalConverter.class), null); - registerSubPane(new TemporalTypeCombo(buildTemporalConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory())); + new TemporalTypeCombo(this, this.buildTemporalConverterHolder(converterHolder), container); // EclipseLink Converter Button elConverterButton = addRadioButton( @@ -121,27 +109,17 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin null); ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); + PropertyValueModel<EclipseLinkConvert> convertModel = this.buildEclipseLinkConvertModel(converterHolder); + PropertyValueModel<Boolean> convertEnabledModel = this.buildNonNullEclipseLinkConvertModel(convertModel); Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); GridData gridData = new GridData(); gridData.horizontalIndent = 20; convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); + new EclipseLinkConvertCombo(this, convertModel, convertEnabledModel, container); return container; } - - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return (converter != null && converter.getType() == EclipseLinkConvert.class) ? (EclipseLinkConvert) converter : null; - } - }; - } - protected PropertyValueModel<Converter> buildConverterHolder() { return new PropertyAspectAdapter<T, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override @@ -151,15 +129,14 @@ public abstract class EclipseLinkVersionMappingComposite<T extends VersionMappin }; } - protected PropertyValueModel<Boolean> buildEclipseLinkConvertBooleanHolder(PropertyValueModel<EclipseLinkConvert> convertHolder) { - return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertHolder) { - @Override - protected Boolean transform(EclipseLinkConvert value) { - return Boolean.valueOf(value != null); - } - }; + protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConvertModel(PropertyValueModel<Converter> converterModel) { + return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterModel, EclipseLinkConvert.CONVERTER_TRANSFORMER); } - + + protected PropertyValueModel<Boolean> buildNonNullEclipseLinkConvertModel(PropertyValueModel<EclipseLinkConvert> convertModel) { + return new TransformationPropertyValueModel<EclipseLinkConvert, Boolean>(convertModel, NotNullObjectTransformer.<EclipseLinkConvert>instance()); + } + protected PropertyValueModel<BaseTemporalConverter> buildTemporalConverterHolder(PropertyValueModel<Converter> converterHolder) { return new TransformationPropertyValueModel<Converter, BaseTemporalConverter>(converterHolder) { @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java index 836dd69386..547f79759c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnComposite.java @@ -354,7 +354,7 @@ public class TenantDiscriminatorColumnComposite extends Pane<ReadOnlyTenantDiscr }; } - private ModifiablePropertyValueModel<String> buildColumnDefinitionHolder(PropertyValueModel<ReadOnlyTenantDiscriminatorColumn2_3> discriminatorColumnHolder) { + private ModifiablePropertyValueModel<String> buildColumnDefinitionHolder(PropertyValueModel<? extends ReadOnlyTenantDiscriminatorColumn2_3> discriminatorColumnHolder) { return new PropertyAspectAdapter<ReadOnlyTenantDiscriminatorColumn2_3, String>(discriminatorColumnHolder, ReadOnlyNamedColumn.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java index f645b8ed1c..2cc4ba79b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/TenantDiscriminatorColumnsComposite.java @@ -42,22 +42,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.part.PageBook; -/** - * Here is the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | AddRemoveListPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - - * - * @version 3.1 - * @since 3.1 - */ -public class TenantDiscriminatorColumnsComposite<T extends JpaNode> extends Pane<T> +public class TenantDiscriminatorColumnsComposite<T extends JpaNode> + extends Pane<T> { /** * The editor used to perform the common behaviors defined in the list pane. @@ -68,23 +54,14 @@ public class TenantDiscriminatorColumnsComposite<T extends JpaNode> extends Pane private ModifiableCollectionValueModel<ReadOnlyTenantDiscriminatorColumn2_3> selectedTenantDiscriminatorColumnsModel; private PropertyValueModel<ReadOnlyTenantDiscriminatorColumn2_3> selectedTenantDiscriminatorColumnModel; - public TenantDiscriminatorColumnsComposite(Pane<? extends T> parentPane, - Composite parent, - TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor, - PropertyValueModel<Boolean> enabledModel) { - - super(parentPane, parent, enabledModel); - this.tenantDiscriminatorColumnsEditor = tenantDiscriminatorColumnsEditor; - initializeLayout2(); - } - - public TenantDiscriminatorColumnsComposite(PropertyValueModel<? extends T> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory, - TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor) { - super(subjectHolder, enabledModel, parent, widgetFactory); + public TenantDiscriminatorColumnsComposite( + Pane<?> parent, + PropertyValueModel<? extends T> subjectModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + TenantDiscriminatorColumnsEditor<T> tenantDiscriminatorColumnsEditor) { + super(parent, subjectModel, enabledModel, parentComposite); this.tenantDiscriminatorColumnsEditor = tenantDiscriminatorColumnsEditor; initializeLayout2(); } 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 7ef374eae1..9fd5a511dd 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 @@ -9,18 +9,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.internal.model.value.PropertyAspectAdapter; 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.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; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkEmbeddableAdvancedComposite; 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.JavaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -30,37 +28,21 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * This pane does not have any widgets. - * - * @see Embeddable - * @see JavaUiFactory - The factory creating this pane - * @see EmbeddableUiProvider - * - * @version 2.3 - * @since 2.1 - */ -public abstract class AbstractJavaEclipseLinkEmbeddableComposite extends AbstractEmbeddableComposite<JavaEmbeddable> - implements JpaComposite +public abstract class AbstractJavaEclipseLinkEmbeddableComposite + extends AbstractEmbeddableComposite<JavaEmbeddable> { - /** - * Creates a new <code>EmbeddableComposite</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 - */ - protected AbstractJavaEclipseLinkEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + protected AbstractJavaEclipseLinkEmbeddableComposite( + PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(embeddableModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - initializeConvertersCollapsibleSection(container); - initializeAdvancedCollapsibleSection(container); + this.initializeConvertersCollapsibleSection(container); + this.initializeAdvancedCollapsibleSection(container); } protected void initializeConvertersCollapsibleSection(Composite container) { 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 8f10127fb7..e14672c9d0 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 @@ -9,12 +9,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.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,31 +29,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * The pane used for an EclipseLink 2.x Java entity. - * - * @see JavaEclipseLinkEntity - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 3.1 - * @since 3.1 - */ public abstract class AbstractJavaEclipseLinkEntity2_xComposite extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> { - /** - * Creates a new <code>EclipseLinkJavaEntityComposite</code>. - * - * @param subjectHolder The holder of the subject <code>JavaEntity</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ protected AbstractJavaEclipseLinkEntity2_xComposite( - PropertyValueModel<? extends JavaEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } @Override 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 48a61c5818..7f73f4c412 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 @@ -9,6 +9,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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -30,31 +31,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * The pane used for an EclipseLink Java entity. - * - * @see JavaEclipseLinkEntity - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.1 - */ public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntity> extends AbstractEntityComposite<T> { - /** - * Creates a new <code>EclipseLinkJavaEntityComposite</code>. - * - * @param subjectHolder The holder of the subject <code>JavaEntity</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ protected AbstractJavaEclipseLinkEntityComposite( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends T> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } 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 67612bdb01..f6e5f25b55 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 @@ -9,6 +9,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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -22,7 +23,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSu import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkNonEmbeddableTypeMappingAdvancedComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.internal.details.AbstractJavaMappedSuperclassComposite; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Generation2_0Composite; @@ -34,32 +34,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * The pane used for an EclipseLink Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.1 - */ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite extends AbstractJavaMappedSuperclassComposite - implements JpaComposite { - /** - * 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 - */ protected AbstractJavaEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/DefaultJavaEclipseLinkOneToManyMappingUiDefinition.java index bcd47819bc..ce596aecf6 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,6 +9,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.MappingKeys; @@ -62,8 +63,8 @@ public class DefaultJavaEclipseLinkOneToManyMappingUiDefinition public String getLinkLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToManyMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToManyMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) { - return factory.createJavaOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + + 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 2e873f5958..d4350c0106 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,6 +9,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.MappingKeys; @@ -62,8 +63,8 @@ public class DefaultJavaEclipseLinkOneToOneMappingUiDefinition public String getLinkLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkOneToOneMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<JavaOneToOneMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) { - return factory.createJavaOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + + 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 832bb9d71e..6890c87202 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -59,8 +60,8 @@ public class DefaultJavaEclipseLinkVariableOneToOneMappingUiDefinition public String getLinkLabel() { return EclipseLinkUiDetailsMessages.DefaultEclipseLinkVariableOneToOneMappingUiProvider_linkLabel; } - - public JpaComposite buildAttributeMappingComposite(JavaUiFactory factory, PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder, PropertyValueModel<Boolean> enabledModel, Composite parent, WidgetFactory widgetFactory) { - return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + + 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/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 642544b3c1..fe20dbbb69 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 @@ -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. @@ -9,6 +9,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; @@ -17,33 +18,35 @@ import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -public class EclipseLink1_2JavaUiFactory extends EclipseLinkJavaUiFactory +public class EclipseLink1_2JavaUiFactory + extends EclipseLinkJavaUiFactory { - public EclipseLink1_2JavaUiFactory() { - super(); - } - - - // **************** java type mapping composites *************************** + // ********** type mappings ********** @Override public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkMappedSuperclass1_2Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkMappedSuperclass1_2Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEntity1_2Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEntity1_2Composite(entityModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEmbeddable1_2Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEmbeddable1_2Composite(embeddableModel, 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/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 37485996ed..405261842d 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 @@ -1,14 +1,15 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.java.JavaEmbeddedIdMapping; @@ -25,97 +26,99 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedIdMapping2_0Composit import org.eclipse.jpt.jpa.ui.jpa2.details.java.JavaUiFactory2_0; import org.eclipse.swt.widgets.Composite; -/** - * EclipseLink2_0JpaUiFactory - */ public class EclipseLink2_0JavaUiFactory extends EclipseLink1_2JavaUiFactory implements JavaUiFactory2_0 { - public EclipseLink2_0JavaUiFactory() { - super(); - } - - - // **************** java type mapping composites *************************** + // ********** type mappings ********** @Override public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEntity2_0Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkMappedSuperclass2_0Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } - // **************** java attribute mapping composites ********************** + // ********** attribute mappings ********** @Override public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> subjectHolder, + PropertyValueModel<JavaIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaEmbeddedIdMappingComposite( - PropertyValueModel<JavaEmbeddedIdMapping> subjectHolder, + PropertyValueModel<JavaEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createJavaElementCollectionMapping2_0Composite( - PropertyValueModel<JavaElementCollectionMapping2_0> subjectHolder, + PropertyValueModel<JavaElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkElementCollectionMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> subjectHolder, + PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> subjectHolder, + PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> subjectHolder, + PropertyValueModel<JavaManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> subjectHolder, + PropertyValueModel<JavaManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkManyToManyMapping2_0Composite(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_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 044d308da8..b447d4b3de 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 @@ -1,48 +1,42 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.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.jpa2.details.java.JavaUiFactory2_0; import org.eclipse.swt.widgets.Composite; -/** - * EclipseLink2_0JpaUiFactory - */ public class EclipseLink2_3JavaUiFactory extends EclipseLink2_0JavaUiFactory - implements JavaUiFactory2_0 { - public EclipseLink2_3JavaUiFactory() { - super(); - } - - - // **************** java type mapping composites *************************** + // ********** type mappings ********** @Override public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEntity2_3Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEntity> entityModel, + Composite parent, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEntity2_3Composite(entityModel, parent, widgetFactory, resourceManager); } @Override public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkMappedSuperclass2_3Composite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + Composite parent, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parent, widgetFactory, resourceManager); } - } 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 a37e75d94f..83a35414dc 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 @@ -9,6 +9,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.JavaBasicMapping; @@ -34,135 +35,147 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkOneToOneMa 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.BaseJavaUiFactory; +import org.eclipse.jpt.jpa.ui.internal.details.java.AbstractJavaUiFactory; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkJavaUiFactory extends BaseJavaUiFactory +public class EclipseLinkJavaUiFactory + extends AbstractJavaUiFactory { - public EclipseLinkJavaUiFactory() { - super(); - } - - // **************** java type mapping composites *************************** + // ********** type mappings ********** @Override public JpaComposite createJavaMappedSuperclassComposite( - PropertyValueModel<JavaMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaEntityComposite( - PropertyValueModel<JavaEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaEmbeddableComposite( - PropertyValueModel<JavaEmbeddable> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - return new JavaEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory); + PropertyValueModel<JavaEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); } - // **************** java attribute mapping composites ********************** + // ********** attribute mappings ********** @Override public JpaComposite createJavaIdMappingComposite( - PropertyValueModel<JavaIdMapping> subjectHolder, + PropertyValueModel<JavaIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaBasicMappingComposite( - PropertyValueModel<JavaBasicMapping> subjectHolder, + PropertyValueModel<JavaBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaVersionMappingComposite( - PropertyValueModel<JavaVersionMapping> subjectHolder, + PropertyValueModel<JavaVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new JavaEclipseLinkVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new JavaEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaManyToOneMappingComposite( - PropertyValueModel<JavaManyToOneMapping> subjectHolder, + PropertyValueModel<JavaManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaOneToManyMappingComposite( - PropertyValueModel<JavaOneToManyMapping> subjectHolder, + PropertyValueModel<JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaOneToOneMappingComposite( - PropertyValueModel<JavaOneToOneMapping> subjectHolder, + PropertyValueModel<JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override public JpaComposite createJavaManyToManyMappingComposite( - PropertyValueModel<JavaManyToManyMapping> subjectHolder, + PropertyValueModel<JavaManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkManyToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createJavaEclipseLinkBasicMapMappingComposite( - PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder, + PropertyValueModel<EclipseLinkBasicMapMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkBasicMapMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createJavaEclipseLinkBasicCollectionMappingComposite( - PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder, + PropertyValueModel<EclipseLinkBasicCollectionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkBasicCollectionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createJavaEclipseLinkVariableOneToOneMappingComposite( - PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder, + PropertyValueModel<EclipseLinkVariableOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkVariableOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } public JpaComposite createJavaEclipseLinkTransformationMappingComposite( - PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder, + PropertyValueModel<EclipseLinkTransformationMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new EclipseLinkTransformationMappingComposite(mappingModel, enabledModel, 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/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 index 158ee1caab..d1427a16e9 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -45,13 +46,7 @@ public class JavaEclipseLinkArrayMapping2_3UiDefinition } - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkArrayMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkArrayMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index 9f82c7169a..a5496453d4 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class JavaEclipseLinkBasicCollectionMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index 5d4e91baa0..681c123e79 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class JavaEclipseLinkBasicMapMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 cdc8e748ab..8019011f18 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 @@ -9,6 +9,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; @@ -22,21 +23,16 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -public class JavaEclipseLinkBasicMappingComposite extends EclipseLinkBasicMappingComposite<BasicMapping> +public class JavaEclipseLinkBasicMappingComposite + extends EclipseLinkBasicMappingComposite<BasicMapping> { - /** - * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public JavaEclipseLinkBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public JavaEclipseLinkBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 926b19da19..2abc55b4a3 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 @@ -9,19 +9,13 @@ ******************************************************************************/ 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.CompositeBooleanPropertyValueModel; 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.common.utility.model.value.ModifiablePropertyValueModel; -import org.eclipse.jpt.jpa.core.context.Converter; -import org.eclipse.jpt.jpa.core.context.ConvertibleMapping; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaElementCollectionMapping2_0; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConvert; 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.EclipseLinkConvertCombo; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -31,29 +25,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.Section; public class JavaEclipseLinkElementCollectionMapping2_0Composite extends EclipseLinkElementCollectionMapping2_0Composite<JavaElementCollectionMapping2_0> { - /** - * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public JavaEclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends JavaElementCollectionMapping2_0> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public JavaEclipseLinkElementCollectionMapping2_0Composite( + PropertyValueModel<? extends JavaElementCollectionMapping2_0> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -89,63 +74,4 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite } }; } - - @Override - protected Composite buildBasicValueTypeSectionClient(Section section) { - Composite container = super.buildBasicValueTypeSectionClient(section); - PropertyValueModel<Converter> converterHolder = buildConverterHolder(); - - // EclipseLink Converter - Button elConverterButton = addRadioButton( - container, - EclipseLinkUiDetailsMessages.TypeSection_converted, - buildConverterBooleanHolder(EclipseLinkConvert.class), - null); - ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); - Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); - GridData gridData = new GridData(); - gridData.horizontalIndent = 20; - convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); - - return container; - } - - protected PropertyValueModel<Converter> buildConverterHolder() { - return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Converter buildValue_() { - return this.subject.getConverter(); - } - }; - } - - protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Boolean buildValue_() { - Converter converter = this.subject.getConverter(); - return Boolean.valueOf(converter.getType() == converterType); - } - - @Override - protected void setValue_(Boolean value) { - if (value.booleanValue()) { - this.subject.setConverter(converterType); - } - } - }; - } - - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null; - } - }; - } -}
\ 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/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 779da80043..28e1f54760 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 @@ -9,70 +9,41 @@ ******************************************************************************/ 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.Embeddable; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.widgets.Section; -/** - * This pane does not have any widgets. - * - * @see Embeddable - * @see JavaUiFactory - The factory creating this pane - * @see EmbeddableUiProvider - * - * @version 2.3 - * @since 2.1 - */ -public class JavaEclipseLinkEmbeddable1_2Composite extends AbstractJavaEclipseLinkEmbeddableComposite +public class JavaEclipseLinkEmbeddable1_2Composite + extends AbstractJavaEclipseLinkEmbeddableComposite { - /** - * Creates a new <code>EmbeddableComposite</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 JavaEclipseLinkEmbeddable1_2Composite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public JavaEclipseLinkEmbeddable1_2Composite( + PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(embeddableModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { this.initializeEmbeddableCollapsibleSection(container); - this.initializeConvertersCollapsibleSection(container); - this.initializeAdvancedCollapsibleSection(container); + super.initializeLayout(container); } @Override - protected Control initializeEmbeddableSection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); + protected Control buildEmbeddableSectionClient(Section embeddableSection) { + Composite container = this.addSubPane(embeddableSection, 2, 0, 0, 0, 0); // Access type widgets this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); + new AccessTypeComboViewer(this, this.buildAccessReferenceModel(), container); return container; } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<JavaEmbeddable, 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/JavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java index 4e530bdd45..7b1bfb618d 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2010 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. @@ -9,36 +9,27 @@ ******************************************************************************/ 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.Embeddable; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.ui.details.java.JavaUiFactory; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.forms.widgets.Section; -/** - * This pane does not have any widgets. - * - * @see Embeddable - * @see JavaUiFactory - The factory creating this pane - * @see EmbeddableUiProvider - * - * @version 2.3 - * @since 2.1 - */ -public class JavaEclipseLinkEmbeddableComposite extends AbstractJavaEclipseLinkEmbeddableComposite +public class JavaEclipseLinkEmbeddableComposite + extends AbstractJavaEclipseLinkEmbeddableComposite { - /** - * Creates a new <code>EmbeddableComposite</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 JavaEclipseLinkEmbeddableComposite(PropertyValueModel<? extends JavaEmbeddable> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { + public JavaEclipseLinkEmbeddableComposite( + PropertyValueModel<? extends JavaEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(embeddableModel, parentComposite, widgetFactory, resourceManager); + } - super(subjectHolder, parent, widgetFactory); + @Override + protected Control buildEmbeddableSectionClient(Section embeddableSection) { + throw new UnsupportedOperationException(); // shouldn't happen } }
\ 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/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 c7fbd63e61..4a87353e71 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 @@ -9,12 +9,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.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; @@ -26,31 +26,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * The pane used for an EclipseLink1.2 Java entity. - * - * @see JavaEclipseLinkEntity - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.2 - */ public class JavaEclipseLinkEntity1_2Composite extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> { - /** - * Creates a new <code>EclipseLinkJavaEntityComposite</code>. - * - * @param subjectHolder The holder of the subject <code>JavaEntity</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ public JavaEclipseLinkEntity1_2Composite( - PropertyValueModel<? extends JavaEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } @Override 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 6bdc55c5bc..adc68e70b0 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 @@ -9,37 +9,21 @@ ******************************************************************************/ 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; -/** - * The pane used for an EclipseLink 2.0 Java entity. - * - * @see JavaEclipseLinkEntity - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 3.1 - * @since 2.2 - */ public class JavaEclipseLinkEntity2_0Composite extends AbstractJavaEclipseLinkEntity2_xComposite { - /** - * Creates a new <code>EclipseLinkJavaEntityComposite</code>. - * - * @param subjectHolder The holder of the subject <code>JavaEntity</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ public JavaEclipseLinkEntity2_0Composite( - PropertyValueModel<? extends JavaEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, 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 9efe4fc2a2..f01ae1ba2a 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 @@ -9,6 +9,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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -25,21 +26,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * The pane used for an EclipseLink 2.3 Java entity. - * - * @version 3.1 - * @since 3.1 - */ public class JavaEclipseLinkEntity2_3Composite extends AbstractJavaEclipseLinkEntity2_xComposite { public JavaEclipseLinkEntity2_3Composite( - PropertyValueModel<? extends JavaEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } @Override 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 33b4aa98ea..0d03fa523f 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 @@ -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. @@ -9,36 +9,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.java.JavaEntity; -import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkEntity; import org.eclipse.swt.widgets.Composite; -/** - * The pane used for an EclipseLink Java entity. - * - * @see JavaEclipseLinkEntity - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.1 - * @since 2.1 - */ public class JavaEclipseLinkEntityComposite extends AbstractJavaEclipseLinkEntityComposite<JavaEntity> { - /** - * Creates a new <code>EclipseLinkJavaEntityComposite</code>. - * - * @param subjectHolder The holder of the subject <code>JavaEntity</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ public JavaEclipseLinkEntityComposite( - PropertyValueModel<? extends JavaEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, 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 157b40223a..1c92b42d00 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 @@ -9,6 +9,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; @@ -24,12 +25,12 @@ public class JavaEclipseLinkIdMapping2_0Composite extends EclipseLinkIdMappingComposite<JavaIdMapping> { public JavaEclipseLinkIdMapping2_0Composite( - PropertyValueModel<? extends JavaIdMapping> subjectHolder, + PropertyValueModel<? extends JavaIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/JavaEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkIdMappingComposite.java index 9ef1ddb7df..24f1837efa 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 @@ -9,6 +9,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.IdMapping; @@ -19,12 +20,12 @@ public class JavaEclipseLinkIdMappingComposite extends EclipseLinkIdMappingComposite<IdMapping> { public JavaEclipseLinkIdMappingComposite( - PropertyValueModel<? extends IdMapping> subjectHolder, + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 01b5616d3c..aef4720eea 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 @@ -9,6 +9,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.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -31,12 +32,12 @@ public class JavaEclipseLinkManyToManyMapping2_0Composite extends EclipseLinkManyToManyMappingComposite<ManyToManyMapping> { public JavaEclipseLinkManyToManyMapping2_0Composite( - PropertyValueModel<? extends ManyToManyMapping> subjectHolder, + PropertyValueModel<? extends ManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 5c82afec90..94759b084b 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 @@ -9,6 +9,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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -33,12 +34,12 @@ public class JavaEclipseLinkManyToOneMapping2_0Composite extends AbstractManyToOneMapping2_0Composite<JavaManyToOneMapping, JavaManyToOneRelationship2_0> { public JavaEclipseLinkManyToOneMapping2_0Composite( - PropertyValueModel<? extends JavaManyToOneMapping> subjectHolder, + PropertyValueModel<? extends JavaManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 87dc67f9da..8d04f01b8f 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 @@ -9,12 +9,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.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.EclipseLinkMappedSuperclass; 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; @@ -23,31 +23,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * The pane used for an EclipseLink Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.1 - */ public class JavaEclipseLinkMappedSuperclass1_2Composite extends AbstractJavaEclipseLinkMappedSuperclassComposite { - /** - * 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 JavaEclipseLinkMappedSuperclass1_2Composite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override 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 020fb34110..2f88bd4ac4 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 @@ -9,12 +9,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.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.EclipseLinkMappedSuperclass; 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; @@ -23,31 +23,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * The pane used for an EclipseLink Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.3 - */ public class JavaEclipseLinkMappedSuperclass2_0Composite extends AbstractJavaEclipseLinkMappedSuperclassComposite { - /** - * 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 JavaEclipseLinkMappedSuperclass2_0Composite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override 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 59a9d12570..a6b22f1cc0 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 @@ -9,12 +9,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.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.EclipseLinkMappedSuperclass; 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; @@ -23,24 +23,15 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * The pane used for an EclipseLink Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 3.3 - * @since 3.3 - */ public class JavaEclipseLinkMappedSuperclass2_1Composite extends AbstractJavaEclipseLinkMappedSuperclassComposite { public JavaEclipseLinkMappedSuperclass2_1Composite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -81,4 +72,4 @@ public class JavaEclipseLinkMappedSuperclass2_1Composite protected Control initializeCachingSection(Composite container) { return new JavaEclipseLinkCaching2_0Composite(this, this.buildCachingHolder(), 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_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 4c0ddf0e29..a0bfa31b8b 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 @@ -9,12 +9,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.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.EclipseLinkMappedSuperclass; 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; @@ -32,31 +32,15 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; -/** - * The pane used for an EclipseLink 2.3 Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 3.1 - * @since 3.1 - */ public class JavaEclipseLinkMappedSuperclass2_3Composite extends AbstractJavaEclipseLinkMappedSuperclassComposite { - /** - * 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 JavaEclipseLinkMappedSuperclass2_3Composite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -126,4 +110,4 @@ public class JavaEclipseLinkMappedSuperclass2_3Composite } }; } -}
\ 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/JavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkMappedSuperclassComposite.java index c7cb0b2dec..e081e30b5b 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 @@ -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. @@ -9,36 +9,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.java.JavaMappedSuperclass; -import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass; import org.eclipse.swt.widgets.Composite; -/** - * The pane used for an EclipseLink Java Mapped Superclass. - * - * @see EclipseLinkMappedSuperclass - * @see EclipselinkJpaUiFactory - The factory creating this pane - * - * @version 2.1 - * @since 2.1 - */ public class JavaEclipseLinkMappedSuperclassComposite extends AbstractJavaEclipseLinkMappedSuperclassComposite { - /** - * 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 JavaEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends JavaMappedSuperclass> 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 6ba80b40a0..1bca1dbdc3 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 @@ -1,14 +1,15 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -34,12 +35,12 @@ public class JavaEclipseLinkOneToManyMapping2_0Composite extends EclipseLinkOneToManyMappingComposite<JavaOneToManyMapping> { public JavaEclipseLinkOneToManyMapping2_0Composite( - PropertyValueModel<? extends JavaOneToManyMapping> subjectHolder, + PropertyValueModel<? extends JavaOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 b438e63966..f1d4f3a2ac 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 @@ -9,6 +9,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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -39,12 +40,12 @@ public class JavaEclipseLinkOneToOneMapping2_0Composite extends AbstractOneToOneMapping2_0Composite<JavaOneToOneMapping, JavaOneToOneRelationship2_0> { public JavaEclipseLinkOneToOneMapping2_0Composite( - PropertyValueModel<? extends JavaOneToOneMapping> subjectHolder, + PropertyValueModel<? extends JavaOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 index 9cf6e91a19..680704451b 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class JavaEclipseLinkStructureMapping2_3UiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkStructureMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkStructureMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index 8e7dbc145e..dc7ab62928 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class JavaEclipseLinkTransformationMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index e583209518..a94b200c6b 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class JavaEclipseLinkVariableOneToOneMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - JavaUiFactory factory, - PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 9b81692e80..4cc6f9e929 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 @@ -9,6 +9,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.VersionMapping; @@ -18,19 +19,13 @@ import org.eclipse.swt.widgets.Composite; public class JavaEclipseLinkVersionMappingComposite extends EclipseLinkVersionMappingComposite<VersionMapping> { - /** - * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>VersionMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public JavaEclipseLinkVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public JavaEclipseLinkVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPageManager.java index 9c9390641e..23cf161fae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPageManager.java @@ -9,6 +9,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.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; @@ -20,7 +21,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConverters import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo; import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo; -import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPage; +import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractEntityMappingsDetailsPageManager; import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPackageChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.PersistenceUnitMetadataComposite; @@ -74,30 +75,18 @@ import org.eclipse.ui.forms.widgets.Section; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see AbstractEclipseLinkEntityMappingsDetailsPage - The parent container * @see CatalogCombo * @see EnumFormComboViewer * @see EntityMappingsGeneratorsComposite * @see OrmPackageChooser - * @see QueriesComposite * @see PersistenceUnitMetadataComposite * @see SchemaCombo - * - * @version 2.3 - * @since 2.1 */ -public abstract class AbstractEclipseLinkEntityMappingsDetailsPage extends AbstractEntityMappingsDetailsPage +public abstract class AbstractEclipseLinkEntityMappingsDetailsPageManager + extends AbstractEntityMappingsDetailsPageManager { - /** - * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>. - * - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - protected AbstractEclipseLinkEntityMappingsDetailsPage(Composite parent, - WidgetFactory widgetFactory) { - - super(parent, widgetFactory); + protected AbstractEclipseLinkEntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + super(parent, widgetFactory, resourceManager); } @Override @@ -136,4 +125,4 @@ public abstract class AbstractEclipseLinkEntityMappingsDetailsPage extends Abstr } }; } -}
\ 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/AbstractEclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java new file mode 100644 index 0000000000..348c8ca805 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractEclipseLinkOrmXmlUiFactory.java @@ -0,0 +1,145 @@ +/******************************************************************************* + * 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.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.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; + +public abstract class AbstractEclipseLinkOrmXmlUiFactory + extends AbstractOrmXmlUiFactory +{ + // ********** type mappings ********** + + @Override + public JpaComposite createOrmMappedSuperclassComposite( + PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkMappedSuperclassComposite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmEntityComposite( + PropertyValueModel<OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEntityComposite(entityModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmEmbeddableComposite( + PropertyValueModel<OrmEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEmbeddableComposite(embeddableModel, parentComposite, widgetFactory, resourceManager); + } + + + // ********** attribute mappings ********** + + @Override + public JpaComposite createOrmIdMappingComposite( + PropertyValueModel<OrmIdMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmBasicMappingComposite( + PropertyValueModel<OrmBasicMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkBasicMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmVersionMappingComposite( + PropertyValueModel<OrmVersionMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkVersionMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmManyToOneMappingComposite( + PropertyValueModel<OrmManyToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkManyToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmOneToManyMappingComposite( + PropertyValueModel<OrmOneToManyMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToManyMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmOneToOneMappingComposite( + PropertyValueModel<OrmOneToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToOneMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); + } + + @Override + public JpaComposite createOrmManyToManyMappingComposite( + PropertyValueModel<OrmManyToManyMapping> 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); + } +} 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 1e0d07db59..b380e13f29 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * 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.orm.OrmEntity; @@ -19,12 +19,15 @@ 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 + extends AbstractOrmEclipseLinkEntityComposite { protected AbstractOrmEclipseLinkEntity2_xComposite( - PropertyValueModel<? extends OrmEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } @Override 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 b72784588d..6a68266001 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * 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.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; @@ -29,12 +29,15 @@ 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 + extends AbstractOrmEntityComposite { protected AbstractOrmEclipseLinkEntityComposite( - PropertyValueModel<? extends OrmEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/AbstractOrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java index f62211cc53..7b4a893feb 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 @@ -9,6 +9,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; @@ -23,7 +24,6 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSupe import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertersComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkNonEmbeddableTypeMappingAdvancedComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite; import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; @@ -44,13 +44,13 @@ import org.eclipse.ui.forms.widgets.Section; public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite extends AbstractMappedSuperclassComposite<OrmMappedSuperclass> - implements JpaComposite { protected AbstractOrmEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java deleted file mode 100644 index 0d89a0a126..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/BaseEclipseLinkOrmXmlUiFactory.java +++ /dev/null @@ -1,132 +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.eclipselink.ui.internal.details.orm; - -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.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingComposite; -import org.eclipse.jpt.jpa.ui.internal.details.orm.BaseOrmXmlUiFactory; -import org.eclipse.swt.widgets.Composite; - -public abstract class BaseEclipseLinkOrmXmlUiFactory extends BaseOrmXmlUiFactory -{ - // **************** orm type mapping composites **************************** - - @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkMappedSuperclassComposite(subjectHolder, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEntityComposite(subjectHolder, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmEmbeddableComposite( - PropertyValueModel<OrmEmbeddable> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEmbeddableComposite(subjectHolder, parent, widgetFactory); - } - - - // **************** orm attribute mapping composites *********************** - - @Override - public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkIdMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkBasicMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkVersionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToManyMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } - - @Override - public JpaComposite createOrmTransientMappingComposite( - PropertyValueModel<OrmTransientMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new TransientMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java index d64e41aecf..77421991e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLink2_3PersistenceUnitMetadataComposite.java @@ -30,7 +30,7 @@ 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.db.CatalogCombo; import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsPage; +import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsPageManager; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; import org.eclipse.jpt.jpa.ui.internal.details.orm.PersistenceUnitMetadataComposite; import org.eclipse.jpt.jpa.ui.internal.jpa2.Jpa2_0FlagTransformer; @@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.Group; * * @see PersistenceUnitMetadata * @see OrmPersistenceUnitDefaults - * @see EntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPageManager - The parent container * @see CatalogCombo * @see SchemaCombo * @see EnumFormComboViewer @@ -143,12 +143,12 @@ public class EclipseLink2_3PersistenceUnitMetadataComposite extends PersistenceU tenantDiscriminatorColumnGroupPane.setLayoutData(gridData); this.tenantDiscriminatorColumnsComposite = new TenantDiscriminatorColumnsComposite<OrmPersistenceUnitDefaults>( - getPersistenceUnitDefaultsHolder(), - buildPaneEnablerHolder(), - tenantDiscriminatorColumnGroupPane, - getWidgetFactory(), - buildTenantDiscriminatorColumnsEditor() - ); + this, + this.getPersistenceUnitDefaultsHolder(), + this.buildPaneEnablerHolder(), + tenantDiscriminatorColumnGroupPane, + this.buildTenantDiscriminatorColumnsEditor() + ); } private PropertyValueModel<Boolean> buildPaneEnablerHolder() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java index 0711d7f618..0792c0108d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkConverterDialog.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; @@ -16,6 +17,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; 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.eclipselink.core.context.EclipseLinkConverter; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; @@ -39,10 +41,13 @@ public class EclipseLinkConverterDialog // ********** constructors ********** /** - * Use this constructor to edit an existing conversion value + * Use this constructor to edit an <em>existing</em> conversion value. */ - public EclipseLinkConverterDialog(Shell parent, EclipseLinkConverterContainer converterContainer) { - super(parent); + public EclipseLinkConverterDialog( + Shell parentShell, + ResourceManager resourceManager, + EclipseLinkConverterContainer converterContainer) { + super(parentShell, resourceManager, EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverter); this.converterContainer = converterContainer; } @@ -54,17 +59,6 @@ public class EclipseLinkConverterDialog // ********** open ********** @Override - protected void configureShell(Shell shell) { - super.configureShell(shell); - shell.setText(this.getTitle()); - } - - @Override - protected String getTitle() { - return EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverter; - } - - @Override protected String getDescriptionTitle() { return EclipseLinkUiDetailsMessages.EclipseLinkConverterDialog_addConverterDescriptionTitle; } @@ -76,7 +70,7 @@ public class EclipseLinkConverterDialog @Override protected DialogPane<EclipseLinkConverterStateObject> buildLayout(Composite container) { - return new ConversionValueDialogPane(container); + return new ConversionValueDialogPane(this.getSubjectHolder(), container, this.resourceManager); } @Override @@ -106,12 +100,16 @@ public class EclipseLinkConverterDialog return getSubject().getConverterType(); } - private class ConversionValueDialogPane extends DialogPane<EclipseLinkConverterStateObject> { - + static class ConversionValueDialogPane + extends DialogPane<EclipseLinkConverterStateObject> + { private Text nameText; - ConversionValueDialogPane(Composite parent) { - super(EclipseLinkConverterDialog.this.getSubjectHolder(), parent); + ConversionValueDialogPane( + PropertyValueModel<EclipseLinkConverterStateObject> subjectModel, + Composite parentComposite, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, resourceManager); } @Override 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 b872475860..903150bffa 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 @@ -9,6 +9,7 @@ ******************************************************************************/ 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; @@ -58,10 +59,7 @@ public class EclipseLinkEntityMappings2_0DetailsProvider resourceType.equals(EclipseLinkOrmXml2_2Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager( - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkEntityMappings2_0DetailsPage(parent, widgetFactory); + public JpaDetailsPageManager<? extends JpaStructureNode> 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 215e534a36..b776b0b2ba 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 @@ -9,6 +9,7 @@ ******************************************************************************/ 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; @@ -58,10 +59,7 @@ public class EclipseLinkEntityMappings2_3DetailsProvider resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager( - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkEntityMappings2_3DetailsPage(parent, widgetFactory); + public JpaDetailsPageManager<? extends JpaStructureNode> 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/EclipseLinkEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager.java index f66ee8c966..20ad33b2d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager.java @@ -9,9 +9,11 @@ ******************************************************************************/ 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.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; +import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite; import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo; import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo; import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite; @@ -61,7 +63,6 @@ import org.eclipse.swt.widgets.Composite; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see EclipseLinkEntityMappingsDetailsPage - The parent container * @see CatalogCombo * @see EnumFormComboViewer * @see EntityMappingsGeneratorsComposite @@ -69,22 +70,11 @@ import org.eclipse.swt.widgets.Composite; * @see QueriesComposite * @see PersistenceUnitMetadataComposite * @see SchemaCombo - * - * @version 2.2 - * @since 2.1 */ -public class EclipseLinkEntityMappingsDetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage +public class EclipseLinkEntityMappingsDetailsPageManager + extends AbstractEclipseLinkEntityMappingsDetailsPageManager { - /** - * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>. - * - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkEntityMappingsDetailsPage(Composite parent, - WidgetFactory widgetFactory) { - - super(parent, widgetFactory); + public EclipseLinkEntityMappingsDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + super(parent, 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/orm/EclipseLinkEntityMappings2_0DetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_0.java index 82718d1f47..f2c695e5da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_0.java @@ -9,9 +9,11 @@ ******************************************************************************/ 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.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; +import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite; import org.eclipse.jpt.jpa.ui.internal.details.db.CatalogCombo; import org.eclipse.jpt.jpa.ui.internal.details.db.SchemaCombo; import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsGeneratorsComposite; @@ -53,7 +55,7 @@ import org.eclipse.swt.widgets.Control; * | ------------------------------------------------------------------------- | * | ------------------------------------------------------------------------- | * | | | | - * | | OrmQueriesComposite | | + * | | QueriesComposite | | * | | | | * | ------------------------------------------------------------------------- | * | ------------------------------------------------------------------------- | @@ -64,30 +66,19 @@ import org.eclipse.swt.widgets.Control; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see EclipseLinkEntityMappings2_0DetailsPage - The parent container * @see CatalogCombo * @see EnumFormComboViewer * @see EntityMappingsGeneratorsComposite * @see OrmPackageChooser - * @see OrmQueriesComposite + * @see QueriesComposite * @see PersistenceUnitMetadataComposite * @see SchemaCombo - * - * @version 2.3 - * @since 2.1 */ -public class EclipseLinkEntityMappings2_0DetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage +public class EclipseLinkEntityMappingsDetailsPageManager2_0 + extends AbstractEclipseLinkEntityMappingsDetailsPageManager { - /** - * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>. - * - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkEntityMappings2_0DetailsPage(Composite parent, - WidgetFactory widgetFactory) { - - super(parent, widgetFactory); + public EclipseLinkEntityMappingsDetailsPageManager2_0(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + super(parent, widgetFactory, resourceManager); } @Override @@ -99,4 +90,4 @@ public class EclipseLinkEntityMappings2_0DetailsPage extends AbstractEclipseLink protected Control initializeQueriesSection(Composite container) { return new Queries2_0Composite(this, this.buildQueryContainerHolder(), 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/orm/EclipseLinkEntityMappings2_3DetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_3.java index b11f63332f..327fca4303 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsPageManager2_3.java @@ -9,6 +9,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.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Queries2_0Composite; @@ -66,23 +67,12 @@ import org.eclipse.ui.forms.widgets.Section; * | | | | * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> - * - * - * @version 3.1 - * @since 3.1 */ -public class EclipseLinkEntityMappings2_3DetailsPage extends AbstractEclipseLinkEntityMappingsDetailsPage +public class EclipseLinkEntityMappingsDetailsPageManager2_3 + extends AbstractEclipseLinkEntityMappingsDetailsPageManager { - /** - * Creates a new <code>EclipseLinkEntityMappingsDetailsPage</code>. - * - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public EclipseLinkEntityMappings2_3DetailsPage(Composite parent, - WidgetFactory widgetFactory) { - - super(parent, widgetFactory); + public EclipseLinkEntityMappingsDetailsPageManager2_3(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { + super(parent, widgetFactory, resourceManager); } @Override @@ -132,5 +122,4 @@ public class EclipseLinkEntityMappings2_3DetailsPage extends AbstractEclipseLink protected Control initializeMultitenancySection(Composite container) { return new EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite(this, 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/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 6ddf201262..f849606af2 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 @@ -9,6 +9,7 @@ ******************************************************************************/ 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; @@ -58,10 +59,7 @@ public class EclipseLinkEntityMappingsDetailsProvider || resourceType.equals(EclipseLinkOrmXml1_2Definition.instance().getResourceType()); } - public JpaDetailsPageManager<? extends JpaStructureNode> buildDetailsPageManager( - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkEntityMappingsDetailsPage(parent, widgetFactory); + public JpaDetailsPageManager<? extends JpaStructureNode> 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/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java index 1120f44de0..db6ef2e413 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite.java @@ -61,11 +61,12 @@ public class EclipseLinkEntityMappingsTenantDiscriminatorColumnsComposite extend protected TenantDiscriminatorColumnsComposite<EntityMappings> buildTenantDiscriminatorColumnsComposite(Composite container) { return new TenantDiscriminatorColumnsComposite<EntityMappings>( - getSubjectHolder(), - new TenantDiscriminatorColumnPaneEnablerHolder(), - container, - getWidgetFactory(), - buildTenantDiscriminatorColumnsEditor()); + this, + this.getSubjectHolder(), + new TenantDiscriminatorColumnPaneEnablerHolder(), + container, + this.buildTenantDiscriminatorColumnsEditor() + ); } 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 72001f7562..a3419cf271 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 @@ -9,6 +9,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.orm.OrmBasicMapping; @@ -23,88 +24,98 @@ import org.eclipse.jpt.jpa.core.context.orm.OrmVersionMapping; import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkOrmXml1_1UiFactory extends BaseEclipseLinkOrmXmlUiFactory +public class EclipseLinkOrmXml1_1UiFactory + extends AbstractEclipseLinkOrmXmlUiFactory { - // **************** orm attribute mapping composites *********************** - + // ********** attribute mappings ********** + @Override public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> subjectHolder, + PropertyValueModel<OrmIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkIdMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder, + PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEmbeddedIdMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> subjectHolder, + PropertyValueModel<OrmBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkBasicMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> subjectHolder, + PropertyValueModel<OrmVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkVersionMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> subjectHolder, + PropertyValueModel<OrmManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToOneMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkManyToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> subjectHolder, + PropertyValueModel<OrmOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToManyMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> subjectHolder, + PropertyValueModel<OrmOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToOneMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToOneMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> subjectHolder, + PropertyValueModel<OrmManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToManyMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkManyToManyMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> subjectHolder, + PropertyValueModel<OrmEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEmbeddedMapping1_1Composite(subjectHolder, enabledModel,parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager 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/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 c89eec7d73..8e983cd41f 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 @@ -9,6 +9,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.orm.OrmBasicMapping; @@ -27,114 +28,129 @@ import org.eclipse.jpt.jpa.ui.details.JpaComposite; import org.eclipse.jpt.jpa.ui.jpa2.details.orm.OrmXmlUiFactory2_0; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkOrmXml2_0UiFactory - extends BaseEclipseLinkOrmXmlUiFactory +public class EclipseLinkOrmXml2_0UiFactory + extends AbstractEclipseLinkOrmXmlUiFactory implements OrmXmlUiFactory2_0 { + // ********** type mappings ********** + @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEntity2_0Composite(subjectHolder, parent, widgetFactory); + public JpaComposite createOrmMappedSuperclassComposite( + PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkMappedSuperclass2_0Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } - + @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkMappedSuperclass2_0Composite(subjectHolder, parent, widgetFactory); + public JpaComposite createOrmEntityComposite( + PropertyValueModel<OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEntity2_0Composite(entityModel, parentComposite, widgetFactory, resourceManager); } - - // **************** orm attribute mapping composites *********************** - + + + // ********** attribute mappings ********** + @Override public JpaComposite createOrmIdMappingComposite( - PropertyValueModel<OrmIdMapping> subjectHolder, + PropertyValueModel<OrmIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmEmbeddedMappingComposite( - PropertyValueModel<OrmEmbeddedMapping> subjectHolder, + PropertyValueModel<OrmEmbeddedMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEmbeddedMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEmbeddedMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmEmbeddedIdMappingComposite( - PropertyValueModel<OrmEmbeddedIdMapping> subjectHolder, + PropertyValueModel<OrmEmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEmbeddedIdMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEmbeddedIdMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmBasicMappingComposite( - PropertyValueModel<OrmBasicMapping> subjectHolder, + PropertyValueModel<OrmBasicMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkBasicMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkBasicMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmVersionMappingComposite( - PropertyValueModel<OrmVersionMapping> subjectHolder, + PropertyValueModel<OrmVersionMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkVersionMapping1_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkVersionMapping1_1Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmManyToOneMappingComposite( - PropertyValueModel<OrmManyToOneMapping> subjectHolder, + PropertyValueModel<OrmManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkManyToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmOneToManyMappingComposite( - PropertyValueModel<OrmOneToManyMapping> subjectHolder, + PropertyValueModel<OrmOneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmOneToOneMappingComposite( - PropertyValueModel<OrmOneToOneMapping> subjectHolder, + PropertyValueModel<OrmOneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkOneToOneMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkOneToOneMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + @Override public JpaComposite createOrmManyToManyMappingComposite( - PropertyValueModel<OrmManyToManyMapping> subjectHolder, + PropertyValueModel<OrmManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkManyToManyMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkManyToManyMapping2_0Composite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } - + public JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder, + PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkElementCollectionMapping2_0Composite(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkElementCollectionMapping2_0Composite(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_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 9b314371db..d84d3470ea 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 @@ -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. @@ -9,6 +9,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.orm.OrmMappedSuperclass; @@ -19,21 +20,27 @@ import org.eclipse.swt.widgets.Composite; public class EclipseLinkOrmXml2_1UiFactory extends EclipseLinkOrmXml2_0UiFactory { + // ********** type mappings ********** @Override - public JpaComposite createOrmElementCollectionMapping2_0Composite( - PropertyValueModel<OrmElementCollectionMapping2_0> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkElementCollectionMapping2_1Composite(subjectHolder, enabledModel, parent, widgetFactory); + public JpaComposite createOrmMappedSuperclassComposite( + PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkMappedSuperclass2_1Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } + + // ********** attribute mappings ********** + @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkMappedSuperclass2_1Composite(subjectHolder, parent, widgetFactory); + public JpaComposite createOrmElementCollectionMapping2_0Composite( + PropertyValueModel<OrmElementCollectionMapping2_0> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkElementCollectionMapping2_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/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 fe0ce5fc9a..1448193272 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 @@ -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. @@ -9,6 +9,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.orm.OrmEntity; @@ -19,19 +20,23 @@ import org.eclipse.swt.widgets.Composite; public class EclipseLinkOrmXml2_3UiFactory extends EclipseLinkOrmXml2_0UiFactory { + // ********** type mappings ********** + @Override - public JpaComposite createOrmEntityComposite( - PropertyValueModel<OrmEntity> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkEntity2_3Composite(subjectHolder, parent, widgetFactory); + public JpaComposite createOrmMappedSuperclassComposite( + PropertyValueModel<OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkMappedSuperclass2_3Composite(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override - public JpaComposite createOrmMappedSuperclassComposite( - PropertyValueModel<OrmMappedSuperclass> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - return new OrmEclipseLinkMappedSuperclass2_3Composite(subjectHolder, parent, widgetFactory); + public JpaComposite createOrmEntityComposite( + PropertyValueModel<OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + return new OrmEclipseLinkEntity2_3Composite(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/EclipseLinkOrmXmlUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java index 36e300c097..74a9a30d76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 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. @@ -9,7 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; -public class EclipseLinkOrmXmlUiFactory extends BaseEclipseLinkOrmXmlUiFactory +public class EclipseLinkOrmXmlUiFactory + extends AbstractEclipseLinkOrmXmlUiFactory { - //nothing + // nothing } 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 index 1893978953..72c354e10b 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,13 +45,7 @@ public class OrmEclipseLinkArrayMapping2_3UiDefinition super(); } - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkArrayMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkArrayMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory); + 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/OrmEclipseLinkBasicCollectionMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMapping1_1Composite.java deleted file mode 100644 index 86aec0547f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMapping1_1Composite.java +++ /dev/null @@ -1,64 +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.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.eclipselink.core.context.EclipseLinkBasicCollectionMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; -import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.swt.widgets.Composite; - -/** - * - * @version 2.2 - * @since 2.2 - */ -public class OrmEclipseLinkBasicCollectionMapping1_1Composite extends Pane<EclipseLinkBasicCollectionMapping> - implements JpaComposite -{ - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkBasicCollectionMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicCollectionMapping> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); - } - - @Override - protected Composite addComposite(Composite container) { - return this.addSubPane(container, 2, 0, 0, 0, 0); - } - - @Override - protected void initializeLayout(Composite container) { - this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EclipseLinkBasicCollectionMapping, 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/OrmEclipseLinkBasicCollectionMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicCollectionMappingUiDefinition.java index ad59afbd01..41e67b83ff 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class OrmEclipseLinkBasicCollectionMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkBasicCollectionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkBasicCollectionMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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/OrmEclipseLinkBasicMapMapping1_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMapping1_1Composite.java deleted file mode 100644 index a49581b295..0000000000 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMapping1_1Composite.java +++ /dev/null @@ -1,64 +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.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.eclipselink.core.context.EclipseLinkBasicMapMapping; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; -import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.swt.widgets.Composite; - -/** - * - * @version 2.2 - * @since 2.2 - */ -public class OrmEclipseLinkBasicMapMapping1_1Composite extends Pane<EclipseLinkBasicMapMapping> - implements JpaComposite -{ - /** - * Creates a new <code>EclipseLinkBasicCollectionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkBasicMapMapping1_1Composite(PropertyValueModel<? extends EclipseLinkBasicMapMapping> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); - } - - @Override - protected Composite addComposite(Composite container) { - return this.addSubPane(container, 2, 0, 0, 0, 0); - } - - @Override - protected void initializeLayout(Composite container) { - this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolderHolder(), container); - } - - protected PropertyValueModel<AccessHolder> buildAccessHolderHolder() { - return new PropertyAspectAdapter<EclipseLinkBasicMapMapping, 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/OrmEclipseLinkBasicMapMappingUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkBasicMapMappingUiDefinition.java index a034356191..4c29d1e6c3 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class OrmEclipseLinkBasicMapMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkBasicMapMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkBasicMapMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 7aecc13395..1b29224d6d 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 @@ -9,6 +9,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; @@ -30,21 +31,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -public class OrmEclipseLinkBasicMapping1_1Composite extends EclipseLinkBasicMappingComposite<BasicMapping> +public class OrmEclipseLinkBasicMapping1_1Composite + extends EclipseLinkBasicMappingComposite<BasicMapping> { - /** - * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkBasicMapping1_1Composite(PropertyValueModel<? extends BasicMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkBasicMapping1_1Composite( + PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 7e6bab1add..ec590e0371 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 @@ -9,6 +9,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; @@ -26,21 +27,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; -public class OrmEclipseLinkBasicMappingComposite extends EclipseLinkBasicMappingComposite<BasicMapping> +public class OrmEclipseLinkBasicMappingComposite + extends EclipseLinkBasicMappingComposite<BasicMapping> { - /** - * Creates a new <code>EclipseLinkOrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkBasicMappingComposite(PropertyValueModel<? extends BasicMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkBasicMappingComposite( + PropertyValueModel<? extends BasicMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 d9e54c549e..902a1438e7 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 @@ -9,18 +9,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.internal.model.value.CompositeBooleanPropertyValueModel; 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.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.core.context.AccessHolder; -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.ui.internal.details.EclipseLinkConvertCombo; 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; @@ -33,29 +27,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkElementCollectionMapping2_0Composite extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0> { - /** - * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkElementCollectionMapping2_0Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkElementCollectionMapping2_0Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -99,63 +84,4 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite } }; } - - @Override - protected Composite buildBasicValueTypeSectionClient(Section section) { - Composite container = super.buildBasicValueTypeSectionClient(section); - PropertyValueModel<Converter> converterHolder = buildConverterHolder(); - - // EclipseLink Converter - Button elConverterButton = addRadioButton( - container, - EclipseLinkUiDetailsMessages.TypeSection_converted, - buildConverterBooleanHolder(EclipseLinkConvert.class), - null); - ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); - Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); - GridData gridData = new GridData(); - gridData.horizontalIndent = 20; - convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); - - return container; - } - - protected PropertyValueModel<Converter> buildConverterHolder() { - return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Converter buildValue_() { - return this.subject.getConverter(); - } - }; - } - - protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Boolean buildValue_() { - Converter converter = this.subject.getConverter(); - return Boolean.valueOf(converter.getType() == converterType); - } - - @Override - protected void setValue_(Boolean value) { - if (value.booleanValue()) { - this.subject.setConverter(converterType); - } - } - }; - } - - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null; - } - }; - } -}
\ 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/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 0abf326ec4..9985b33adc 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 @@ -9,20 +9,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.CompositeBooleanPropertyValueModel; 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.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.core.context.AccessHolder; -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.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkConvertCombo; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkElementCollectionMapping2_0Composite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; @@ -36,29 +30,20 @@ import org.eclipse.jpt.jpa.ui.internal.jpa2.details.CollectionTable2_0Composite; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.JptUiDetailsMessages2_0; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.TargetClassChooser; import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkElementCollectionMapping2_1Composite extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0> { - /** - * Creates a new <code>EclipseLink1_1OrmBasicMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>BasicMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkElementCollectionMapping2_1Composite(PropertyValueModel<? extends ElementCollectionMapping2_0> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkElementCollectionMapping2_1Composite( + PropertyValueModel<? extends ElementCollectionMapping2_0> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -115,63 +100,4 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite } }; } - - @Override - protected Composite buildBasicValueTypeSectionClient(Section section) { - Composite container = super.buildBasicValueTypeSectionClient(section); - PropertyValueModel<Converter> converterHolder = buildConverterHolder(); - - // EclipseLink Converter - Button elConverterButton = addRadioButton( - container, - EclipseLinkUiDetailsMessages.TypeSection_converted, - buildConverterBooleanHolder(EclipseLinkConvert.class), - null); - ((GridData) elConverterButton.getLayoutData()).horizontalSpan = 2; - - PropertyValueModel<EclipseLinkConvert> convertHolder = buildEclipseLinkConverterHolder(converterHolder); - PropertyValueModel<Boolean> convertEnabledModel = CompositeBooleanPropertyValueModel.and(getEnabledModel(), buildEclipseLinkConvertBooleanHolder(convertHolder)); - Label convertLabel = this.addLabel(container, EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_converterNameLabel, convertEnabledModel); - GridData gridData = new GridData(); - gridData.horizontalIndent = 20; - convertLabel.setLayoutData(gridData); - registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory())); - - return container; - } - - protected PropertyValueModel<Converter> buildConverterHolder() { - return new PropertyAspectAdapter<ConvertibleMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Converter buildValue_() { - return this.subject.getConverter(); - } - }; - } - - protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { - @Override - protected Boolean buildValue_() { - Converter converter = this.subject.getConverter(); - return Boolean.valueOf(converter.getType() == converterType); - } - - @Override - protected void setValue_(Boolean value) { - if (value.booleanValue()) { - this.subject.setConverter(converterType); - } - } - }; - } - - protected PropertyValueModel<EclipseLinkConvert> buildEclipseLinkConverterHolder(PropertyValueModel<Converter> converterHolder) { - return new TransformationPropertyValueModel<Converter, EclipseLinkConvert>(converterHolder) { - @Override - protected EclipseLinkConvert transform_(Converter converter) { - return converter.getType() == EclipseLinkConvert.class ? (EclipseLinkConvert) converter : null; - } - }; - } -}
\ 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/OrmEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java index fc053ae83f..d1bc249acb 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 @@ -9,97 +9,41 @@ ******************************************************************************/ 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.Embeddable; 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; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkEmbeddableAdvancedComposite; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.internal.JptUiMessages; -import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite; -import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComboViewer; -import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; -import org.eclipse.jpt.jpa.ui.internal.details.orm.MetadataCompleteTriStateCheckBox; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmJavaClassChooser; +import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmEmbeddableComposite; 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; -/** - * This pane does not have any widgets. - * - * @see Embeddable - * @see EmbeddableUiProvider - * - * @version 2.3 - * @since 2.1 - */ public class OrmEclipseLinkEmbeddableComposite - extends AbstractEmbeddableComposite<OrmEmbeddable> - implements JpaComposite + extends AbstractOrmEmbeddableComposite { - /** - * Creates a new <code>EmbeddableComposite</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 OrmEclipseLinkEmbeddableComposite(PropertyValueModel<? extends OrmEmbeddable> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public OrmEclipseLinkEmbeddableComposite( + PropertyValueModel<? extends OrmEmbeddable> embeddableModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(embeddableModel, parentComposite, widgetFactory, resourceManager); } @Override protected void initializeLayout(Composite container) { - this.initializeEmbeddableCollapsibleSection(container); - initializeConvertersCollapsibleSection(container); - initializeAdvancedCollapsibleSection(container); - } - - @Override - protected Control initializeEmbeddableSection(Composite container) { - container = this.addSubPane(container, 2, 0, 0, 0, 0); - - // Java class widgets - Hyperlink javaClassHyperlink = this.addHyperlink(container, JptUiDetailsOrmMessages.OrmJavaClassChooser_javaClass); - new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink); - - // Access type widgets - this.addLabel(container, JptUiMessages.AccessTypeComposite_access); - new AccessTypeComboViewer(this, this.buildAccessHolder(), container); - - // Metadata complete widgets - MetadataCompleteTriStateCheckBox metadataCompleteComposite = new MetadataCompleteTriStateCheckBox(this, getSubjectHolder(), container); - GridData gridData = new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalSpan = 2; - metadataCompleteComposite.getControl().setLayoutData(gridData); - - return container; - } - - protected PropertyValueModel<AccessHolder> buildAccessHolder() { - return new PropertyAspectAdapter<OrmEmbeddable, AccessHolder>( - getSubjectHolder()) - { - @Override - protected AccessHolder buildValue_() { - return this.subject.getPersistentType(); - } - }; + super.initializeLayout(container); + this.initializeConvertersCollapsibleSection(container); + this.initializeAdvancedCollapsibleSection(container); } protected void initializeConvertersCollapsibleSection(Composite container) { 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 75efb18467..19d4ed19f2 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 @@ -9,6 +9,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; @@ -31,12 +32,12 @@ public class OrmEclipseLinkEmbeddedIdMapping1_1Composite extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping> { public OrmEclipseLinkEmbeddedIdMapping1_1Composite( - PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder, + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 e38a76eb10..2928f27005 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ + * 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. + * + * 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.EmbeddedIdMapping; @@ -29,12 +29,12 @@ public class OrmEclipseLinkEmbeddedIdMapping2_0Composite extends OrmEclipseLinkEmbeddedIdMapping1_1Composite { public OrmEclipseLinkEmbeddedIdMapping2_0Composite( - PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder, + PropertyValueModel<? extends EmbeddedIdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 d28f75f763..3b45ca3b1b 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 @@ -9,6 +9,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; @@ -26,38 +27,16 @@ 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> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | EmbeddedAttributeOverridesComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see EmbeddedMapping - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkEmbeddedMapping1_1Composite extends AbstractEmbeddedMappingComposite<EmbeddedMapping> { - /** - * Creates a new <code>EmbeddedMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkEmbeddedMapping1_1Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkEmbeddedMapping1_1Composite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 4e4f5ffdba..8279b032f4 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 @@ -9,6 +9,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; @@ -18,7 +19,6 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsM 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; -import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.EmbeddedMapping2_0OverridesComposite; @@ -27,39 +27,16 @@ 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> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | EmbeddedAttributeOverridesComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see EmbeddedMapping - * @see BaseJavaUiFactory - The factory creating this pane - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkEmbeddedMapping2_0Composite extends AbstractEmbeddedMappingComposite<EmbeddedMapping> { - /** - * Creates a new <code>EmbeddedMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>EmbeddedMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkEmbeddedMapping2_0Composite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkEmbeddedMapping2_0Composite( + PropertyValueModel<? extends EmbeddedMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 280bd08ab1..4eba113784 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 @@ -1,26 +1,29 @@ /******************************************************************************* - * Copyright (c) 2009, 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 - *******************************************************************************/ + * 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.orm.OrmEntity; import org.eclipse.swt.widgets.Composite; -public class OrmEclipseLinkEntity2_0Composite extends AbstractOrmEclipseLinkEntity2_xComposite +public class OrmEclipseLinkEntity2_0Composite + extends AbstractOrmEclipseLinkEntity2_xComposite { public OrmEclipseLinkEntity2_0Composite( - PropertyValueModel<? extends OrmEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 183e5e2532..2dc74dbf2c 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * 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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -26,12 +26,15 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -public class OrmEclipseLinkEntity2_3Composite extends AbstractOrmEclipseLinkEntity2_xComposite +public class OrmEclipseLinkEntity2_3Composite + extends AbstractOrmEclipseLinkEntity2_xComposite { public OrmEclipseLinkEntity2_3Composite( - PropertyValueModel<? extends OrmEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(entityModel, parentComposite, widgetFactory, resourceManager); } @Override 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 5a694741b2..20b27daff1 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 @@ -1,26 +1,29 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * 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.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.swt.widgets.Composite; -public class OrmEclipseLinkEntityComposite extends AbstractOrmEclipseLinkEntityComposite +public class OrmEclipseLinkEntityComposite + extends AbstractOrmEclipseLinkEntityComposite { public OrmEclipseLinkEntityComposite( - PropertyValueModel<? extends OrmEntity> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmEntity> entityModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 464c50ad60..fe2b08f442 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 @@ -9,6 +9,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; @@ -31,12 +32,12 @@ public class OrmEclipseLinkIdMapping1_1Composite extends EclipseLinkIdMappingComposite<IdMapping> { public OrmEclipseLinkIdMapping1_1Composite( - PropertyValueModel<? extends IdMapping> subjectHolder, + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/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 2a8594e2a4..87da6b5bab 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 @@ -9,6 +9,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; @@ -30,12 +31,12 @@ public class OrmEclipseLinkIdMapping2_0Composite extends OrmEclipseLinkIdMapping1_1Composite { public OrmEclipseLinkIdMapping2_0Composite( - PropertyValueModel<? extends IdMapping> subjectHolder, + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/OrmEclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkIdMappingComposite.java index 843c43ab95..dc800a1aef 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 @@ -9,6 +9,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; @@ -27,12 +28,12 @@ public class OrmEclipseLinkIdMappingComposite extends EclipseLinkIdMappingComposite<IdMapping> { public OrmEclipseLinkIdMappingComposite( - PropertyValueModel<? extends IdMapping> subjectHolder, + PropertyValueModel<? extends IdMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 3e2383028a..04b6b52a36 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 @@ -9,9 +9,9 @@ ******************************************************************************/ 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.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; @@ -21,8 +21,6 @@ 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.FetchTypeComboViewer; import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyJoiningStrategyPane; -import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText; @@ -31,63 +29,16 @@ 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 | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link ManyToManyMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToManyJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link CascadeComposite} - * @see {@link OrderingComposite} - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkManyToManyMapping1_1Composite 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 OrmEclipseLinkManyToManyMapping1_1Composite(PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkManyToManyMapping1_1Composite( + PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 d7073e216b..5aac494765 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 @@ -9,6 +9,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.orm.OrmManyToManyMapping; @@ -33,12 +34,12 @@ public class OrmEclipseLinkManyToManyMapping2_0Composite extends EclipseLinkManyToManyMappingComposite<OrmManyToManyMapping> { public OrmEclipseLinkManyToManyMapping2_0Composite( - PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder, + PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 8c2eb22874..b7e290e825 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 @@ -9,9 +9,9 @@ ******************************************************************************/ 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.ManyToManyMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkJoinFetchComboViewer; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkManyToManyMappingComposite; @@ -19,8 +19,6 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsM 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.ManyToManyJoiningStrategyPane; -import org.eclipse.jpt.jpa.ui.internal.details.OrderingComposite; import org.eclipse.jpt.jpa.ui.internal.details.TargetEntityClassChooser; import org.eclipse.jpt.jpa.ui.internal.details.orm.JptUiDetailsOrmMessages; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappingNameText; @@ -29,63 +27,16 @@ 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 | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OrderingComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see {@link ManyToManyMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToManyJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link CascadeComposite} - * @see {@link OrderingComposite} - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkManyToManyMappingComposite 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 OrmEclipseLinkManyToManyMappingComposite(PropertyValueModel<? extends OrmManyToManyMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkManyToManyMappingComposite( + PropertyValueModel<? extends OrmManyToManyMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 be0b8b2838..3236cc2054 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 @@ -9,6 +9,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; @@ -32,63 +33,16 @@ 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> - * - * @see {@link ManyToOneMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToOneJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkManyToOneMapping1_1Composite extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping> { - /** - * Creates a new <code>EclipseLink1_1ManyToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkManyToOneMapping1_1Composite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkManyToOneMapping1_1Composite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 86ddbdaa7c..884d490ac5 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 @@ -9,6 +9,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; @@ -38,12 +39,12 @@ public class OrmEclipseLinkManyToOneMapping2_0Composite extends AbstractManyToOneMapping2_0Composite<ManyToOneMapping, ManyToOneRelationship2_0> { public OrmEclipseLinkManyToOneMapping2_0Composite( - PropertyValueModel<? extends ManyToOneMapping> subjectHolder, + PropertyValueModel<? extends ManyToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/OrmEclipseLinkManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkManyToOneMappingComposite.java index e667440f60..84498b3ae9 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 @@ -9,6 +9,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; @@ -30,63 +31,16 @@ 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> - * - * @see {@link ManyToOneMapping} - * @see {@link TargetEntityClassChooser} - * @see {@link ManyToOneJoiningStrategyPane} - * @see {@link FetchTypeComboViewer} - * @see {@link OptionalComposite} - * @see {@link CascadeComposite} - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkManyToOneMappingComposite extends EclipseLinkManyToOneMappingComposite<ManyToOneMapping> { - /** - * Creates a new <code>EclipseLink1_1ManyToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>ManyToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkManyToOneMappingComposite( + PropertyValueModel<? extends ManyToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 d827e7588a..3849aad483 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * 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.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; @@ -20,10 +20,11 @@ public class OrmEclipseLinkMappedSuperclass2_0Composite extends AbstractOrmEclipseLinkMappedSuperclassComposite { public OrmEclipseLinkMappedSuperclass2_0Composite( - PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override 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 b70434d881..c08f2b5f36 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 @@ -9,6 +9,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; @@ -26,13 +27,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkMappedSuperclass2_1Composite - extends AbstractOrmEclipseLinkMappedSuperclassComposite { - + extends AbstractOrmEclipseLinkMappedSuperclassComposite +{ public OrmEclipseLinkMappedSuperclass2_1Composite( - PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override 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 e845ebf3d5..c20b22e901 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 @@ -9,6 +9,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; @@ -29,13 +30,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class OrmEclipseLinkMappedSuperclass2_3Composite - extends AbstractOrmEclipseLinkMappedSuperclassComposite { - + extends AbstractOrmEclipseLinkMappedSuperclassComposite +{ public OrmEclipseLinkMappedSuperclass2_3Composite( - PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, resourceManager); } @Override 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 c1b6e3fa23..626b924fd2 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 @@ -1,15 +1,15 @@ /******************************************************************************* - * Copyright (c) 2008, 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 - *******************************************************************************/ + * 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.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; @@ -19,9 +19,10 @@ public class OrmEclipseLinkMappedSuperclassComposite extends AbstractOrmEclipseLinkMappedSuperclassComposite { public OrmEclipseLinkMappedSuperclassComposite( - PropertyValueModel<? extends OrmMappedSuperclass> subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<? extends OrmMappedSuperclass> mappedSuperclassModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappedSuperclassModel, parentComposite, widgetFactory, 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 af1adee3fd..a046539648 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 @@ -9,6 +9,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; @@ -31,16 +32,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; - public class OrmEclipseLinkOneToManyMapping1_1Composite extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> { public OrmEclipseLinkOneToManyMapping1_1Composite( - PropertyValueModel<? extends OneToManyMapping> subjectHolder, + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 b291477c23..21e3f5614c 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 @@ -1,14 +1,15 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -35,17 +36,16 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Hyperlink; - public class OrmEclipseLinkOneToManyMapping2_0Composite extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> { public OrmEclipseLinkOneToManyMapping2_0Composite( - PropertyValueModel<? extends OneToManyMapping> subjectHolder, + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/OrmEclipseLinkOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToManyMappingComposite.java index 2390dacc2d..d5db154585 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 @@ -9,6 +9,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; @@ -34,11 +35,12 @@ public class OrmEclipseLinkOneToManyMappingComposite extends EclipseLinkOneToManyMappingComposite<OneToManyMapping> { public OrmEclipseLinkOneToManyMappingComposite( - PropertyValueModel<? extends OneToManyMapping> subjectHolder, + PropertyValueModel<? extends OneToManyMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 0905086660..55a560f51f 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 @@ -9,6 +9,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; @@ -34,82 +35,16 @@ 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 | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | AccessTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OneToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkJoinFetchComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkPrivateOwnedComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see OneToOneMapping - * @see AccessTypeComposite - * @see CascadeComposite - * @see EclipseLinkJoinFetchComboViewer - * @see EclipseLinkPrivateOwnedCheckBox - * @see FetchTypeComboViewer - * @see MappedByPane - * @see OneToOneJoiningStrategyPane - * @see OptionalComposite - * @see TargetEntityClassChooser - * - * @version 2.3 - * @since 2.2 - */ public class OrmEclipseLinkOneToOneMapping1_1Composite -extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> + extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> { - /** - * Creates a new <code>Eclipselink1_1OneToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkOneToOneMapping1_1Composite(PropertyValueModel<? extends OneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkOneToOneMapping1_1Composite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 6a3bc231cc..697d350b47 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 @@ -9,6 +9,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; @@ -44,12 +45,12 @@ public class OrmEclipseLinkOneToOneMapping2_0Composite extends AbstractOneToOneMapping2_0Composite<OneToOneMapping, OneToOneRelationship2_0> { public OrmEclipseLinkOneToOneMapping2_0Composite( - PropertyValueModel<? extends OneToOneMapping> subjectHolder, + PropertyValueModel<? extends OneToOneMapping> mappingModel, PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(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/OrmEclipseLinkOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkOneToOneMappingComposite.java index da930dd4c0..f43a61cd16 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 @@ -9,6 +9,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; @@ -32,82 +33,16 @@ 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 | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | AccessTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OneToOneJoiningStrategyPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | FetchTypeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkJoinFetchComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | OptionalComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | EclipseLinkPrivateOwnedComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * | ------------------------------------------------------------------------- | - * | | | | - * | | CascadeComposite | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see OneToOneMapping - * @see AccessTypeComposite - * @see CascadeComposite - * @see EclipseLinkJoinFetchComboViewer - * @see EclipseLinkPrivateOwnedCheckBox - * @see FetchTypeComboViewer - * @see MappedByPane - * @see OneToOneJoiningStrategyPane - * @see OptionalComposite - * @see TargetEntityClassChooser - * - * @version 2.2 - * @since 2.2 - */ public class OrmEclipseLinkOneToOneMappingComposite -extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> + extends EclipseLinkOneToOneMappingComposite<OneToOneMapping> { - /** - * Creates a new <code>Eclipselink1_1OneToOneMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>IOneToOneMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkOneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkOneToOneMappingComposite( + PropertyValueModel<? extends OneToOneMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 index 81d66a90eb..6ca35e2d19 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,13 +45,7 @@ public class OrmEclipseLinkStructureMapping2_3UiDefinition super(); } - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkStructureMapping2_3> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkStructureMapping2_3Composite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index eef7a31258..3cefcea512 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class OrmEclipseLinkTransformationMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkTransformationMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkTransformationMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 index e459f3deaa..563eb33f11 100644 --- 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 @@ -9,6 +9,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.ReadOnlyPersistentAttribute; @@ -44,14 +45,7 @@ public class OrmEclipseLinkVariableOneToOneMappingUiDefinition super(); } - - public JpaComposite buildAttributeMappingComposite( - OrmXmlUiFactory factory, - PropertyValueModel<EclipseLinkVariableOneToOneMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - return new EclipseLinkVariableOneToOneMappingComposite(subjectHolder, enabledModel, parent, widgetFactory); + 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 a4092f02c9..3152a8bcb3 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 @@ -9,6 +9,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; @@ -30,19 +31,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkVersionMapping1_1Composite extends EclipseLinkVersionMappingComposite<VersionMapping> { - /** - * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>VersionMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkVersionMapping1_1Composite(PropertyValueModel<? extends VersionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkVersionMapping1_1Composite( + PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override 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 0e9516f689..8ded1ffa43 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 @@ -9,6 +9,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; @@ -26,19 +27,13 @@ import org.eclipse.ui.forms.widgets.Hyperlink; public class OrmEclipseLinkVersionMappingComposite extends EclipseLinkVersionMappingComposite<VersionMapping> { - /** - * Creates a new <code>EclipseLinkOrmVersionMappingComposite</code>. - * - * @param subjectHolder The holder of the subject <code>VersionMapping</code> - * @param parent The parent container - * @param widgetFactory The factory used to create various common widgets - */ - public OrmEclipseLinkVersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder, - PropertyValueModel<Boolean> enabledModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, enabledModel, parent, widgetFactory); + public OrmEclipseLinkVersionMappingComposite( + PropertyValueModel<? extends VersionMapping> mappingModel, + PropertyValueModel<Boolean> enabledModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java index 37b4183ff4..c1e3690ab1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPage.java @@ -1,15 +1,16 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.eclipselink.ui.internal.persistence.caching; import java.util.Collection; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; @@ -25,14 +26,14 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class EclipseLinkPersistenceUnitCachingEditorPage<T extends Caching> - extends Pane<T> + extends Pane<T> { public EclipseLinkPersistenceUnitCachingEditorPage( PropertyValueModel<T> subjectModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java index b2facfae40..98b0181074 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkPersistenceUnitCachingEditorPageDefinition.java @@ -1,19 +1,21 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.eclipselink.ui.internal.persistence.caching; 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.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.JpaStructureNode; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Caching; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; @@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitCachingEditorPageDefinition super(); } - public String getPageText() { - return EclipseLinkUiMessages.PersistenceXmlCachingTab_title; + public ImageDescriptor getTitleImageDescriptor() { + return null; } - public ImageDescriptor getPageImageDescriptor() { - return null; + public String getTitleText() { + return EclipseLinkUiMessages.PersistenceXmlCachingTab_title; } public String getHelpID() { @@ -58,16 +60,22 @@ public class EclipseLinkPersistenceUnitCachingEditorPageDefinition } @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitCachingEditorPage<Caching>(this.buildCachingModel(jpaRootStructureNodeModel), parent, widgetFactory); + protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitCachingEditorPage<Caching>(buildCachingModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager); } - - private PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - return new TransformationPropertyValueModel<PersistenceUnit, Caching>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) { - @Override - protected Caching transform_(PersistenceUnit value) { - return ((EclipseLinkPersistenceUnit) value).getCaching(); - } - }; + + public static PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + return new TransformationPropertyValueModel<PersistenceUnit, Caching>(persistenceUnitModel, CACHING_TRANSFORMER); + } + + public static final Transformer<PersistenceUnit, Caching> CACHING_TRANSFORMER = new CachingTransformer(); + + public static class CachingTransformer + extends AbstractTransformer<PersistenceUnit, Caching> + { + @Override + protected Caching transform_(PersistenceUnit persistenceUnit) { + return ((EclipseLinkPersistenceUnit) persistenceUnit).getCaching(); + } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java index c9c373a436..b6ab360c9a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection; import java.util.Collection; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; -import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; @@ -35,14 +35,15 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; public class EclipseLinkPersistenceUnitConnectionEditorPage - extends Pane<Connection> { - + extends Pane<Connection> +{ public EclipseLinkPersistenceUnitConnectionEditorPage( - PropertyValueModel<Connection> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + PropertyValueModel<Connection> connectionModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager + ) { + super(connectionModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -83,7 +84,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage ); IntegerCombo<?> combo = addCacheStatementsSizeCombo(client); - this.installControlEnabler(cacheStatementsHolder, combo); + this.controlEnabledState(cacheStatementsHolder, combo.getControl()); TriStateCheckBox nativeSqlCheckBox = this.addTriStateCheckBoxWithDefault( @@ -342,8 +343,4 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage } }; } - - private void installControlEnabler(ModifiablePropertyValueModel<Boolean> cacheStatementsHolder, IntegerCombo<?> combo) { - SWTTools.controlEnabledState(cacheStatementsHolder, combo.getControl()); - } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java index 092ff71f17..4b239e7e8c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPageDefinition.java @@ -10,10 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection; 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.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.JpaStructureNode; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Connection; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; @@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitConnectionEditorPageDefinition super(); } - public String getPageText() { - return EclipseLinkUiMessages.PersistenceXmlConnectionTab_title; + public ImageDescriptor getTitleImageDescriptor() { + return null; } - public ImageDescriptor getPageImageDescriptor() { - return null; + public String getTitleText() { + return EclipseLinkUiMessages.PersistenceXmlConnectionTab_title; } public String getHelpID() { @@ -58,16 +60,22 @@ public class EclipseLinkPersistenceUnitConnectionEditorPageDefinition } @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitConnectionEditorPage(this.buildConnectionModel(jpaRootStructureNodeModel), parent, widgetFactory); + protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitConnectionEditorPage(buildConnectionModel(persistenceUnitModel), parent, widgetFactory, resourceManager); } - private PropertyValueModel<Connection> buildConnectionModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - return new TransformationPropertyValueModel<PersistenceUnit, Connection>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) { - @Override - protected Connection transform_(PersistenceUnit value) { - return ((EclipseLinkPersistenceUnit) value).getConnection(); - } - }; + public static PropertyValueModel<Connection> buildConnectionModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + return new TransformationPropertyValueModel<PersistenceUnit, Connection>(persistenceUnitModel, CONNECTION_TRANSFORMER); + } + + public static final Transformer<PersistenceUnit, Connection> CONNECTION_TRANSFORMER = new ConnectionTransformer(); + + public static class ConnectionTransformer + extends AbstractTransformer<PersistenceUnit, Connection> + { + @Override + protected Connection transform_(PersistenceUnit persistenceUnit) { + return ((EclipseLinkPersistenceUnit) persistenceUnit).getConnection(); + } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java index 3a943b7bd7..aaaecca50f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java @@ -10,6 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; @@ -37,10 +38,10 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Customi { public EclipseLinkPersistenceUnitCustomizationEditorPage( PropertyValueModel<T> subjectModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, widgetFactory, resourceManager); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java index 9ea912ee72..67a303a33f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.java @@ -10,10 +10,12 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization; 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.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.JpaStructureNode; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; @@ -45,12 +47,12 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPageDefinition super(); } - public String getPageText() { - return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_title; + public ImageDescriptor getTitleImageDescriptor() { + return null; } - public ImageDescriptor getPageImageDescriptor() { - return null; + public String getTitleText() { + return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_title; } public String getHelpID() { @@ -58,19 +60,22 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPageDefinition } @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>( - this.buildCustomizationHolder(jpaRootStructureNodeModel), - parent, - widgetFactory); + protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitCustomizationEditorPage<Customization>(buildCustomizationModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager); } - private PropertyValueModel<Customization> buildCustomizationHolder(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - return new TransformationPropertyValueModel<PersistenceUnit, Customization>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) { - @Override - protected Customization transform_(PersistenceUnit value) { - return ((EclipseLinkPersistenceUnit) value).getCustomization(); - } - }; + public static PropertyValueModel<Customization> buildCustomizationModel(PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + return new TransformationPropertyValueModel<PersistenceUnit, Customization>(persistenceUnitModel, CUSTOMIZATION_TRANSFORMER); + } + + public static final Transformer<PersistenceUnit, Customization> CUSTOMIZATION_TRANSFORMER = new CustomizationTransformer(); + + public static class CustomizationTransformer + extends AbstractTransformer<PersistenceUnit, Customization> + { + @Override + protected Customization transform_(PersistenceUnit persistenceUnit) { + return ((EclipseLinkPersistenceUnit) persistenceUnit).getCustomization(); + } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java index e96f17fef5..d8cb77e729 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPage.java @@ -9,6 +9,7 @@ *******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general;
+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.persistence.PersistenceUnit;
@@ -19,22 +20,21 @@ import org.eclipse.swt.widgets.Control; public class EclipseLinkPersistenceUnitGeneralEditorPage
extends PersistenceUnitGeneralEditorPage
{
-
public EclipseLinkPersistenceUnitGeneralEditorPage(
PropertyValueModel<PersistenceUnit> subjectHolder,
Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectHolder, parent, widgetFactory);
+ WidgetFactory widgetFactory,
+ ResourceManager resourceManager) {
+ super(subjectHolder, parent, widgetFactory, resourceManager);
}
@Override
- protected Control buildMappingFilesComposite(Composite parent) {
- return new EclipseLinkPersistenceUnitMappingFilesComposite(this, parent).getControl();
+ protected Control buildMappingFilesComposite(Composite parentComposite) {
+ return new EclipseLinkPersistenceUnitMappingFilesComposite(this, parentComposite).getControl();
}
@Override
- protected Control buildJarFilesComposite(Composite parent) {
- return new EclipseLinkPersistenceUnitJarFilesComposite(this, parent).getControl();
+ protected Control buildJarFilesComposite(Composite parentComposite) {
+ return new EclipseLinkPersistenceUnitJarFilesComposite(this, parentComposite).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/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java index 4aaf11bd9c..0a6e5bafb9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralEditorPageDefinition.java @@ -10,9 +10,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general; 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.JpaStructureNode; +import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitGeneralEditorPageDefinition; @@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitGeneralEditorPageDefinition super(); } - @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitGeneralEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory); - } - - public String getPageText() { - return PersistenceUnitGeneralEditorPageDefinition.instance().getPageText(); + public ImageDescriptor getTitleImageDescriptor() { + return PersistenceUnitGeneralEditorPageDefinition.instance().getTitleImageDescriptor(); } - public ImageDescriptor getPageImageDescriptor() { - return PersistenceUnitGeneralEditorPageDefinition.instance().getPageImageDescriptor(); + public String getTitleText() { + return PersistenceUnitGeneralEditorPageDefinition.instance().getTitleText(); } public String getHelpID() { return PersistenceUnitGeneralEditorPageDefinition.instance().getHelpID(); } + + @Override + protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitGeneralEditorPage(persistenceUnitModel, parent, 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/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java index 89b9b89088..4deaf5bb18 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitJarFilesComposite.java @@ -14,18 +14,17 @@ import org.eclipse.jpt.common.core.internal.utility.ProjectTools; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.ui.internal.persistence.ArchiveFileSelectionDialog; -import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitJarFilesComposite; import org.eclipse.jpt.jpa.ui.internal.persistence.ArchiveFileSelectionDialog.DeploymentPathCalculator; +import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitJarFilesComposite; import org.eclipse.swt.widgets.Composite; public class EclipseLinkPersistenceUnitJarFilesComposite extends PersistenceUnitJarFilesComposite { public EclipseLinkPersistenceUnitJarFilesComposite( - Pane<? extends PersistenceUnit> parentPane, - Composite parent) { - - super(parentPane, parent); + Pane<? extends PersistenceUnit> parent, + Composite parentComposite) { + super(parent, parentComposite); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java index 1c76275e6b..1e38f453f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java @@ -10,52 +10,27 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; -import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane; 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.common.utility.model.value.ModifiablePropertyValueModel; +import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.GeneralProperties; import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages; import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitGeneralEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceUnitMappingFilesComposite; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; -/** - * Here the layout of this pane: - * <pre> - * ----------------------------------------------------------------------------- - * | ------------------------------------------------------------------------- | - * | | | | - * | | AddRemoveListPane | | - * | | | | - * | ------------------------------------------------------------------------- | - * -----------------------------------------------------------------------------</pre> - * - * @see PersistenceUnit - * @see PersistenceUnitGeneralEditorPageDefinition - The parent container - * @see AddRemoveListPane - * - * @version 2.0 - * @since 2.0 - */ -public class EclipseLinkPersistenceUnitMappingFilesComposite extends PersistenceUnitMappingFilesComposite +public class EclipseLinkPersistenceUnitMappingFilesComposite + extends PersistenceUnitMappingFilesComposite { - /** - * Creates a new <code>PersistenceUnitMappingFilesComposite</code>. - * - * @param parentPane The parent pane of this one - * @param parent The parent container - */ - public EclipseLinkPersistenceUnitMappingFilesComposite(Pane<? extends PersistenceUnit> parentPane, - Composite parent) { - - super(parentPane, parent); + public EclipseLinkPersistenceUnitMappingFilesComposite( + Pane<? extends PersistenceUnit> parent, + Composite parentComposite) { + super(parent, parentComposite); } @Override @@ -99,9 +74,9 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite extends Persistence private PropertyValueModel<String> buildExcludeEclipselinkOrmStringHolder() { return new TransformationPropertyValueModel<Boolean, String>(buildDefaultExcludeEclipselinkOrmHolder()) { @Override - protected String transform(Boolean value) { - if (value != null) { - String defaultStringValue = value.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False; + protected String transform(Boolean b) { + if (b != null) { + String defaultStringValue = b.booleanValue() ? JptCommonUiMessages.Boolean_True : JptCommonUiMessages.Boolean_False; return NLS.bind(EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrmWithDefault, defaultStringValue); } return EclipseLinkUiMessages.PersistenceXmlGeneralTab_excludeEclipselinkOrm; @@ -123,4 +98,4 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite extends Persistence } }; } -}
\ 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/persistence/options/EclipseLinkLoggingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java index b073c23ac6..f6f3215cd7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options; import java.util.Collection; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.FileChooserComboPane; @@ -29,17 +28,14 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.Hyperlink; -/** - * EclipseLinkLoggingComposite - */ public class EclipseLinkLoggingComposite<T extends Logging> extends Pane<T> { public EclipseLinkLoggingComposite( - PropertyValueModel<T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + Pane<?> parent, + PropertyValueModel<T> subjectModel, + Composite parentComposite) { + super(parent, subjectModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java index 0e219581bd..12410e2710 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options; import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; - import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.util.SWTUtil; @@ -55,19 +55,19 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Hyperlink; import org.eclipse.ui.forms.widgets.Section; - import com.ibm.icu.text.Collator; -public class EclipseLinkPersistenceUnitOptionsEditorPage extends Pane<PersistenceUnit>{ - +public class EclipseLinkPersistenceUnitOptionsEditorPage + extends Pane<PersistenceUnit> +{ private PropertyValueModel<Options> optionsHolder; public EclipseLinkPersistenceUnitOptionsEditorPage( - PropertyValueModel<PersistenceUnit> subjectModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectModel, parent, widgetFactory); + PropertyValueModel<PersistenceUnit> persistenceUnitModel, + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -181,11 +181,11 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage extends Pane<Persisten } protected Control initializeLoggingSection(Section section) { - return new EclipseLinkLoggingComposite<Logging>(this.buildLoggingHolder(), section, getWidgetFactory()).getControl(); + return new EclipseLinkLoggingComposite<Logging>(this, this.buildLoggingHolder(), section).getControl(); } - protected Control initializeSchemaGenerationSection(Section section) { - return new PersistenceXmlSchemaGenerationComposite(this.buildSchemaGenerationHolder(), section, getWidgetFactory()).getControl(); + protected Control initializeSchemaGenerationSection(Section section) { + return new PersistenceXmlSchemaGenerationComposite(this, this.buildSchemaGenerationHolder(), section).getControl(); } protected Control initializeMiscellaneousSection(Section section) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java index 099fc928e3..7434769603 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPageDefinition.java @@ -10,9 +10,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options; 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.JpaStructureNode; +import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkHelpContextIds; import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; @@ -41,12 +42,12 @@ public class EclipseLinkPersistenceUnitOptionsEditorPageDefinition super(); } - public String getPageText() { - return EclipseLinkUiMessages.PersistenceXmlOptionsTab_title; + public ImageDescriptor getTitleImageDescriptor() { + return null; } - public ImageDescriptor getPageImageDescriptor() { - return null; + public String getTitleText() { + return EclipseLinkUiMessages.PersistenceXmlOptionsTab_title; } public String getHelpID() { @@ -54,7 +55,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPageDefinition } @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitOptionsEditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory); + protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitOptionsEditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java index 79fdf74751..0f5dc36154 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/PersistenceXmlSchemaGenerationComposite.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options; import java.util.Collection; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.util.SWTUtil; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; @@ -31,19 +30,11 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -/** - * PersistenceXmlSchemaGenerationTab - */ public class PersistenceXmlSchemaGenerationComposite extends Pane<SchemaGeneration> { - // ********** constructors/initialization ********** - public PersistenceXmlSchemaGenerationComposite( - PropertyValueModel<SchemaGeneration> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectHolder, parent, widgetFactory); + public PersistenceXmlSchemaGenerationComposite(Pane<?> parent, PropertyValueModel<SchemaGeneration> schemaGenModel, Composite parentComposite) { + super(parent, schemaGenModel, parentComposite); } protected String getHelpID() { @@ -357,4 +348,4 @@ public class PersistenceXmlSchemaGenerationComposite } }; } -}
\ 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/v2_0/persistence/EclipseLinkLogging2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java index b37b56cb97..0fb6fd16da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence; import java.util.Collection; -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; +import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel; @@ -31,17 +31,14 @@ import org.eclipse.ui.forms.events.ExpansionEvent; import org.eclipse.ui.forms.widgets.ExpandableComposite; import org.eclipse.ui.forms.widgets.Section; -/** - * EclipseLinkLogging2_0Composite - */ -public class EclipseLinkLogging2_0Composite extends EclipseLinkLoggingComposite<Logging2_0> +public class EclipseLinkLogging2_0Composite + extends EclipseLinkLoggingComposite<Logging2_0> { - public EclipseLinkLogging2_0Composite( - PropertyValueModel<Logging2_0> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + Pane<?> parent, + PropertyValueModel<Logging2_0> subjectModel, + Composite parentComposite) { + super(parent, subjectModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java index 1fabf5575d..e31d2e729a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java @@ -1,18 +1,17 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.ui.internal.v2_0.persistence; import java.util.Collection; - -import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; +import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_4; @@ -22,17 +21,14 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.Section; -/** - * EclipseLinkLogging2_4Composite - */ - -public class EclipseLinkLogging2_4Composite extends EclipseLinkLogging2_0Composite { - +public class EclipseLinkLogging2_4Composite + extends EclipseLinkLogging2_0Composite +{ public EclipseLinkLogging2_4Composite( - PropertyValueModel<Logging2_0> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - super(subjectHolder, parent, widgetFactory); + Pane<?> parent, + PropertyValueModel<Logging2_0> subjectModel, + Composite parentComposite) { + super(parent, subjectModel, parentComposite); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java index f732e6fd4d..2139412df9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPage.java @@ -1,24 +1,25 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.v2_0.persistence; import java.util.Collection; +import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; -import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel; 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.internal.transformer.TransformerAdapter; 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.jpa2.context.persistence.PersistenceUnit2_0; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.SharedCacheMode; import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.CacheType; @@ -40,10 +41,10 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage { public EclipseLinkPersistenceUnitCaching2_0EditorPage( PropertyValueModel<Caching> subjectModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, widgetFactory, resourceManager); } @Override @@ -85,8 +86,8 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage Label flushClearCacheLabel = this.addLabel(client, EclipseLinkUiMessages.PersistenceXmlCachingTab_FlushClearCacheLabel); Combo flushClearCacheCombo = this.addFlushClearCacheCombo(client).getControl(); - SWTTools.controlEnabledState( - this.buildSharedCacheModeEnablerModel(persistenceUnitModel), + this.controlEnabledState( + this.buildSharedCacheModeEnabledModel(persistenceUnitModel), cacheTypeLabel, cacheTypeCombo, cacheSizeLabel, @@ -160,16 +161,8 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage }; } - @SuppressWarnings("unchecked") - private PropertyValueModel<Boolean> buildSharedCacheModeEnablerModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) { - return CompositeBooleanPropertyValueModel.and( - this.getEnabledModel(), - new TransformationPropertyValueModel<SharedCacheMode, Boolean>(this.buildSharedCacheModeModel(persistenceUnitModel)) { - @Override - protected Boolean transform(SharedCacheMode value) { - return Boolean.valueOf(value != SharedCacheMode.NONE); - } - }); + private PropertyValueModel<Boolean> buildSharedCacheModeEnabledModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) { + return new TransformationPropertyValueModel<SharedCacheMode, Boolean>(this.buildSharedCacheModeModel(persistenceUnitModel), SHARED_CACHE_MODE_ENABLED_TRANSFORMER); } private PropertyValueModel<SharedCacheMode> buildSharedCacheModeModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) { @@ -184,6 +177,16 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPage }; } + private static final Transformer<SharedCacheMode, Boolean> SHARED_CACHE_MODE_ENABLED_TRANSFORMER = new SharedCacheModeEnabledTransformer(); + /* CU private */ static class SharedCacheModeEnabledTransformer + extends TransformerAdapter<SharedCacheMode, Boolean> + { + @Override + public Boolean transform(SharedCacheMode mode) { + return Boolean.valueOf(mode != SharedCacheMode.NONE); + } + } + protected EnumFormComboViewer<Caching, CacheType> buildDefaultCacheTypeCombo(Composite container) { return new EnumFormComboViewer<Caching, CacheType>(this, container) { @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java index 4696fccef9..cbbc90041e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition.java @@ -1,22 +1,19 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.v2_0.persistence; 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.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Caching; -import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching.EclipseLinkPersistenceUnitCachingEditorPageDefinition; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition; @@ -44,29 +41,24 @@ public class EclipseLinkPersistenceUnitCaching2_0EditorPageDefinition super(); } - @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitCaching2_0EditorPage(this.buildCachingModel(jpaRootStructureNodeModel), parent, widgetFactory); + public ImageDescriptor getTitleImageDescriptor() { + return this.getCachingEditorPageDefinition().getTitleImageDescriptor(); } - private PropertyValueModel<Caching> buildCachingModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - return new TransformationPropertyValueModel<PersistenceUnit, Caching>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) { - @Override - protected Caching transform_(PersistenceUnit value) { - return ((EclipseLinkPersistenceUnit) value).getCaching(); - } - }; + public String getTitleText() { + return this.getCachingEditorPageDefinition().getTitleText(); } - public String getPageText() { - return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getPageText(); + public String getHelpID() { + return this.getCachingEditorPageDefinition().getHelpID(); } - public String getHelpID() { - return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getHelpID(); + private JpaEditorPageDefinition getCachingEditorPageDefinition() { + return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance(); } - public ImageDescriptor getPageImageDescriptor() { - return EclipseLinkPersistenceUnitCachingEditorPageDefinition.instance().getPageImageDescriptor(); + @Override + protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitCaching2_0EditorPage(EclipseLinkPersistenceUnitCachingEditorPageDefinition.buildCachingModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java index f58df389fc..eee4e21e28 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPage.java @@ -9,23 +9,24 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence; +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.eclipselink.core.context.persistence.Customization; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization.EclipseLinkPersistenceUnitCustomizationEditorPage; import org.eclipse.swt.widgets.Composite; -public class EclipseLinkPersistenceUnitCustomization2_0EditorPage extends EclipseLinkPersistenceUnitCustomizationEditorPage<Customization> +public class EclipseLinkPersistenceUnitCustomization2_0EditorPage + extends EclipseLinkPersistenceUnitCustomizationEditorPage<Customization> { public EclipseLinkPersistenceUnitCustomization2_0EditorPage( PropertyValueModel<Customization> subjectModel, - Composite parent, - WidgetFactory widgetFactory) { - - super(subjectModel, parent, widgetFactory); + Composite parentComposite, + WidgetFactory widgetFactory, + ResourceManager resourceManager) { + super(subjectModel, parentComposite, widgetFactory, resourceManager); } - @Override protected void buildEntityListComposite(Composite parent) { // do nothing diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java index 727ad31d01..5b57a91f3c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition.java @@ -10,13 +10,10 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence; 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.internal.model.value.TransformationPropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization; -import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.EclipseLinkPersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.customization.EclipseLinkPersistenceUnitCustomizationEditorPageDefinition; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition; @@ -44,33 +41,20 @@ public class EclipseLinkPersistenceUnitCustomization2_0EditorPageDefinition super(); } - @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitCustomization2_0EditorPage( - this.buildCustomizationModel(jpaRootStructureNodeModel), - parent, - widgetFactory); - } - - private PropertyValueModel<Customization> buildCustomizationModel(PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - return new TransformationPropertyValueModel<PersistenceUnit, Customization>(this.buildPersistenceUnitModel(jpaRootStructureNodeModel)) { - @Override - protected Customization transform_(PersistenceUnit value) { - return ((EclipseLinkPersistenceUnit) value).getCustomization(); - } - }; + public ImageDescriptor getTitleImageDescriptor() { + return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getTitleImageDescriptor(); } - public String getPageText() { - return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getPageText(); + public String getTitleText() { + return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getTitleText(); } public String getHelpID() { return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getHelpID(); } - public ImageDescriptor getPageImageDescriptor() { - return EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.instance().getPageImageDescriptor(); + @Override + protected void buildEditorPageContent(Composite parentComposite, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitCustomization2_0EditorPage(EclipseLinkPersistenceUnitCustomizationEditorPageDefinition.buildCustomizationModel(persistenceUnitModel), parentComposite, widgetFactory, resourceManager); } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java index 6ad6c46435..07c9b2b859 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPage.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
import java.util.Collection;
-
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IType;
@@ -19,6 +18,7 @@ import org.eclipse.jdt.core.search.IJavaSearchScope; import org.eclipse.jdt.core.search.SearchEngine;
import org.eclipse.jdt.ui.IJavaElementSearchConstants;
import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.window.Window;
@@ -65,11 +65,11 @@ class EclipseLinkPersistenceUnitOptions2_0EditorPage private PropertyValueModel<Options2_0> optionsModel;
public EclipseLinkPersistenceUnitOptions2_0EditorPage(
- PropertyValueModel<PersistenceUnit> subjectModel,
- Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectModel, parent, widgetFactory);
+ PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+ Composite parentComposite,
+ WidgetFactory widgetFactory,
+ ResourceManager resourceManager) {
+ super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
}
@Override
@@ -116,7 +116,7 @@ class EclipseLinkPersistenceUnitOptions2_0EditorPage @Override
protected Control initializeLoggingSection(Section section) {
- return new EclipseLinkLogging2_0Composite(this.buildLoggingModel(), section, getWidgetFactory()).getControl();
+ return new EclipseLinkLogging2_0Composite(this, this.buildLoggingModel(), section).getControl();
}
protected PropertyValueModel<Logging2_0> buildLoggingModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java index d5b38345d3..f858f06714 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition.java @@ -1,18 +1,19 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.v2_0.persistence; 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.JpaStructureNode; +import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options.EclipseLinkPersistenceUnitOptionsEditorPageDefinition; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition; @@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitOptions2_0EditorPageDefinition super(); } - @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitOptions2_0EditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory); - } - - public String getPageText() { - return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageText(); + public ImageDescriptor getTitleImageDescriptor() { + return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleImageDescriptor(); } - public ImageDescriptor getPageImageDescriptor() { - return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageImageDescriptor(); + public String getTitleText() { + return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleText(); } public String getHelpID() { return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getHelpID(); } + + @Override + protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitOptions2_0EditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java index e6e76b6532..75b0ebfdc9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPage.java @@ -9,6 +9,7 @@ *******************************************************************************/
package org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence;
+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.persistence.PersistenceUnit;
@@ -17,18 +18,18 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Section;
class EclipseLinkPersistenceUnitOptions2_4EditorPage
- extends EclipseLinkPersistenceUnitOptions2_0EditorPage {
-
+ extends EclipseLinkPersistenceUnitOptions2_0EditorPage
+{
public EclipseLinkPersistenceUnitOptions2_4EditorPage(
- PropertyValueModel<PersistenceUnit> subjectModel,
- Composite parent,
- WidgetFactory widgetFactory) {
-
- super(subjectModel, parent, widgetFactory);
+ PropertyValueModel<PersistenceUnit> persistenceUnitModel,
+ Composite parentComposite,
+ WidgetFactory widgetFactory,
+ ResourceManager resourceManager) {
+ super(persistenceUnitModel, parentComposite, widgetFactory, resourceManager);
}
@Override
protected Control initializeLoggingSection(Section section) {
- return new EclipseLinkLogging2_4Composite(this.buildLoggingModel(), section, getWidgetFactory()).getControl();
+ return new EclipseLinkLogging2_4Composite(this, this.buildLoggingModel(), section).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/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java index d9e29703f0..70c98731a7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition.java @@ -1,18 +1,19 @@ /******************************************************************************* -* 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 -*******************************************************************************/ + * 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.ui.internal.v2_0.persistence; 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.JpaStructureNode; +import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.options.EclipseLinkPersistenceUnitOptionsEditorPageDefinition; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceUnitEditorPageDefinition; @@ -40,20 +41,20 @@ public class EclipseLinkPersistenceUnitOptions2_4EditorPageDefinition super(); } - @Override - public void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, PropertyValueModel<JpaStructureNode> jpaRootStructureNodeModel) { - new EclipseLinkPersistenceUnitOptions2_4EditorPage(this.buildPersistenceUnitModel(jpaRootStructureNodeModel), parent, widgetFactory); - } - - public String getPageText() { - return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageText(); + public ImageDescriptor getTitleImageDescriptor() { + return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleImageDescriptor(); } - public ImageDescriptor getPageImageDescriptor() { - return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getPageImageDescriptor(); + public String getTitleText() { + return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getTitleText(); } public String getHelpID() { return EclipseLinkPersistenceUnitOptionsEditorPageDefinition.instance().getHelpID(); } + + @Override + protected void buildEditorPageContent(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager, PropertyValueModel<PersistenceUnit> persistenceUnitModel) { + new EclipseLinkPersistenceUnitOptions2_4EditorPage(persistenceUnitModel, parent, widgetFactory, resourceManager); + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java index e5451c3797..a0ac62daa5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/EclipseLinkDynamicEntityWizard.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages; import org.eclipse.jpt.jpa.eclipselink.ui.internal.entity.data.model.DynamicEntityDataModelProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.plugin.JptJpaEclipseLinkUiPlugin; -import org.eclipse.jpt.jpa.ui.internal.JptUiIcons; +import org.eclipse.jpt.jpa.ui.JptJpaUiImages; import org.eclipse.jpt.jpa.ui.internal.wizards.entity.data.model.IEntityDataModelProperties; import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties; import org.eclipse.ui.INewWizard; @@ -46,7 +46,7 @@ public class EclipseLinkDynamicEntityWizard extends DataModelWizard implements I public EclipseLinkDynamicEntityWizard(IDataModel model) { super(model); setWindowTitle(EclipseLinkUiMessages.EclipseLinkDynamicEntityWizard_title); - setDefaultPageImageDescriptor(JptJpaEclipseLinkUiPlugin.instance().buildImageDescriptor(JptUiIcons.ENTITY_WIZ_BANNER)); + setDefaultPageImageDescriptor(JptJpaUiImages.ENTITY_BANNER); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java index d67905da00..01898f2120 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/wizards/gen/GenerateDynamicEntitiesFromSchemaWizard.java @@ -42,10 +42,10 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -public class GenerateDynamicEntitiesFromSchemaWizard extends GenerateEntitiesFromSchemaWizard - implements INewWizard { - - public static final String HELP_CONTEXT_ID = JptJpaEclipseLinkUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$ +public class GenerateDynamicEntitiesFromSchemaWizard + extends GenerateEntitiesFromSchemaWizard +{ + private static final String HELP_CONTEXT_ID = JptJpaEclipseLinkUiPlugin.instance().getPluginID() + ".GenerateEntitiesFromSchemaWizard"; //$NON-NLS-1$ // ********** constructor ********** |