diff options
author | Goulwen Le Fur | 2013-01-11 10:52:47 +0000 |
---|---|---|
committer | Goulwen Le Fur | 2013-01-11 10:52:47 +0000 |
commit | 58fb662eceec61fdbb3c0b26ff1258741a51292d (patch) | |
tree | 484f449aa88a882efd1f34cba6ac9bf262bef3ca | |
parent | daa7509f774fbbf51a5bbb782436924701dc9e1d (diff) | |
download | org.eclipse.eef-58fb662eceec61fdbb3c0b26ff1258741a51292d.tar.gz org.eclipse.eef-58fb662eceec61fdbb3c0b26ff1258741a51292d.tar.xz org.eclipse.eef-58fb662eceec61fdbb3c0b26ff1258741a51292d.zip |
UPDATED: synchronized generationv2.0.0
11 files changed, 250 insertions, 156 deletions
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost index 60bd2fb34..714009202 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/interface_/parts/SimpleSamplePropertiesEditionPart.java.lost @@ -88,3 +88,27 @@ Fri Dec 21 08:16:50 CET 2012 Start of user code for additional methods // End of user code + +Fri Jan 11 11:25:06 CET 2013 +================================================================================ +Start of user code for getters and setters declaration + + // End of user code + +Fri Jan 11 11:25:06 CET 2013 +================================================================================ +Start of user code for additional methods + + // End of user code + +Fri Jan 11 11:51:47 CET 2013 +================================================================================ +Start of user code for getters and setters declaration + + // End of user code + +Fri Jan 11 11:51:47 CET 2013 +================================================================================ +Start of user code for additional methods + + // End of user code diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java index 6c7ef4d52..7d5854624 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RadioSamplePropertiesEditionPartForm.java @@ -258,6 +258,14 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi public void initRadioRequiredProperty(Object input, Enumerator current) { radioRequiredPropertyRadioViewer.setInput(input); radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty); + if (eefElementEditorReadOnlyState && radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(false); + radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(true); + } + } /** @@ -300,6 +308,14 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi public void initRadioOptionalProperty(Object input, Enumerator current) { radioOptionalPropertyRadioViewer.setInput(input); radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty); + if (eefElementEditorReadOnlyState && radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(false); + radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(true); + } + } /** @@ -342,6 +358,9 @@ public class RadioSamplePropertiesEditionPartForm extends SectionPropertiesEditi public void initRadioROProperty(Object input, Enumerator current) { radioROPropertyRadioViewer.setInput(input); radioROPropertyRadioViewer.setSelection(new StructuredSelection(current)); + radioROPropertyRadioViewer.setEnabled(false); + radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } /** diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java index 6b3775b6d..5b3ff91c7 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TotalSamplePropertiesEditionPartForm.java @@ -2099,6 +2099,14 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi public void initRadioRequiredProperty(Object input, Enumerator current) { radioRequiredPropertyRadioViewer.setInput(input); radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty); + if (eefElementEditorReadOnlyState && radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(false); + radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.TotalSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(true); + } + } /** @@ -2141,6 +2149,14 @@ public class TotalSamplePropertiesEditionPartForm extends SectionPropertiesEditi public void initRadioOptionalProperty(Object input, Enumerator current) { radioOptionalPropertyRadioViewer.setInput(input); radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty); + if (eefElementEditorReadOnlyState && radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(false); + radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.TotalSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(true); + } + } /** diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java index 19ace44d5..005c20cab 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RadioSamplePropertiesEditionPartImpl.java @@ -249,6 +249,14 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi public void initRadioRequiredProperty(Object input, Enumerator current) { radioRequiredPropertyRadioViewer.setInput(input); radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty); + if (eefElementEditorReadOnlyState && radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(false); + radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(true); + } + } /** @@ -291,6 +299,14 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi public void initRadioOptionalProperty(Object input, Enumerator current) { radioOptionalPropertyRadioViewer.setInput(input); radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty); + if (eefElementEditorReadOnlyState && radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(false); + radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(true); + } + } /** @@ -333,6 +349,9 @@ public class RadioSamplePropertiesEditionPartImpl extends CompositePropertiesEdi public void initRadioROProperty(Object input, Enumerator current) { radioROPropertyRadioViewer.setInput(input); radioROPropertyRadioViewer.setSelection(new StructuredSelection(current)); + radioROPropertyRadioViewer.setEnabled(false); + radioROPropertyRadioViewer.setToolTipText(EefnrMessages.RadioSample_ReadOnly); + } /** diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java index 357118ae8..885f20deb 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TotalSamplePropertiesEditionPartImpl.java @@ -1957,6 +1957,14 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi public void initRadioRequiredProperty(Object input, Enumerator current) { radioRequiredPropertyRadioViewer.setInput(input); radioRequiredPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty); + if (eefElementEditorReadOnlyState && radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(false); + radioRequiredPropertyRadioViewer.setToolTipText(EefnrMessages.TotalSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioRequiredPropertyRadioViewer.isEnabled()) { + radioRequiredPropertyRadioViewer.setEnabled(true); + } + } /** @@ -1999,6 +2007,14 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi public void initRadioOptionalProperty(Object input, Enumerator current) { radioOptionalPropertyRadioViewer.setInput(input); radioOptionalPropertyRadioViewer.setSelection(new StructuredSelection(current)); + boolean eefElementEditorReadOnlyState = isReadOnly(EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty); + if (eefElementEditorReadOnlyState && radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(false); + radioOptionalPropertyRadioViewer.setToolTipText(EefnrMessages.TotalSample_ReadOnly); + } else if (!eefElementEditorReadOnlyState && !radioOptionalPropertyRadioViewer.isEnabled()) { + radioOptionalPropertyRadioViewer.setEnabled(true); + } + } /** diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrEEFAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrEEFAdapterFactory.java index 3876eb187..4184571cf 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/providers/EefnrEEFAdapterFactory.java @@ -26,195 +26,195 @@ public class EefnrEEFAdapterFactory extends EefnrAdapterFactory { /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedEObjectFlatComboViewerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createRootAdapter() * */ - public Adapter createAdvancedEObjectFlatComboViewerSampleAdapter() { - return new AdvancedEObjectFlatComboViewerSamplePropertiesEditionProvider(); + public Adapter createRootAdapter() { + return new RootPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextareaSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAbstractSampleAdapter() * */ - public Adapter createTextareaSampleAdapter() { - return new TextareaSamplePropertiesEditionProvider(); + public Adapter createAbstractSampleAdapter() { + return new AbstractSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createEObjectFlatComboViewerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTotalSampleAdapter() * */ - public Adapter createEObjectFlatComboViewerSampleAdapter() { - return new EObjectFlatComboViewerSamplePropertiesEditionProvider(); + public Adapter createTotalSampleAdapter() { + return new TotalSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSingleCompositionEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextSampleAdapter() * */ - public Adapter createSingleCompositionEditorSampleAdapter() { - return new SingleCompositionEditorSamplePropertiesEditionProvider(); + public Adapter createTextSampleAdapter() { + return new TextSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createCheckboxSampleAdapter() * */ - public Adapter createSampleAdapter() { - return new SamplePropertiesEditionProvider(); + public Adapter createCheckboxSampleAdapter() { + return new CheckboxSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTableCompositionExtensionEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextareaSampleAdapter() * */ - public Adapter createTableCompositionExtensionEditorSampleAdapter() { - return new TableCompositionExtensionEditorSamplePropertiesEditionProvider(); + public Adapter createTextareaSampleAdapter() { + return new TextareaSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedTableCompositionEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createRadioSampleAdapter() * */ - public Adapter createAdvancedTableCompositionEditorSampleAdapter() { - return new AdvancedTableCompositionEditorSamplePropertiesEditionProvider(); + public Adapter createRadioSampleAdapter() { + return new RadioSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSingleCompositionViewerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createEObjectFlatComboViewerSampleAdapter() * */ - public Adapter createSingleCompositionViewerSampleAdapter() { - return new SingleCompositionViewerSamplePropertiesEditionProvider(); + public Adapter createEObjectFlatComboViewerSampleAdapter() { + return new EObjectFlatComboViewerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createImageViewerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createReferencesTableSampleAdapter() * */ - public Adapter createImageViewerSampleAdapter() { - return new ImageViewerSamplePropertiesEditionProvider(); + public Adapter createReferencesTableSampleAdapter() { + return new ReferencesTableSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createRootAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createEMFComboViewerSampleAdapter() * */ - public Adapter createRootAdapter() { - return new RootPropertiesEditionProvider(); + public Adapter createEMFComboViewerSampleAdapter() { + return new EMFComboViewerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createNamedElementAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createMultiValuedEditorSampleAdapter() * */ - public Adapter createNamedElementAdapter() { - return new NamedElementPropertiesEditionProvider(); + public Adapter createMultiValuedEditorSampleAdapter() { + return new MultiValuedEditorSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createMultiValuedEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTableCompositionEditorSampleAdapter() * */ - public Adapter createMultiValuedEditorSampleAdapter() { - return new MultiValuedEditorSamplePropertiesEditionProvider(); + public Adapter createTableCompositionEditorSampleAdapter() { + return new TableCompositionEditorSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createCheckboxSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedReferencesTableSampleAdapter() * */ - public Adapter createCheckboxSampleAdapter() { - return new CheckboxSamplePropertiesEditionProvider(); + public Adapter createAdvancedReferencesTableSampleAdapter() { + return new AdvancedReferencesTableSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSelectionDialogSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedEObjectFlatComboViewerSampleAdapter() * */ - public Adapter createSelectionDialogSampleAdapter() { - return new SelectionDialogSamplePropertiesEditionProvider(); + public Adapter createAdvancedEObjectFlatComboViewerSampleAdapter() { + return new AdvancedEObjectFlatComboViewerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createReferencesTableSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedTableCompositionEditorSampleAdapter() * */ - public Adapter createReferencesTableSampleAdapter() { - return new ReferencesTableSamplePropertiesEditionProvider(); + public Adapter createAdvancedTableCompositionEditorSampleAdapter() { + return new AdvancedTableCompositionEditorSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createRadioSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createFlatReferencesTableSampleAdapter() * */ - public Adapter createRadioSampleAdapter() { - return new RadioSamplePropertiesEditionProvider(); + public Adapter createFlatReferencesTableSampleAdapter() { + return new FlatReferenceTableSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTableCompositionEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSampleAdapter() * */ - public Adapter createTableCompositionEditorSampleAdapter() { - return new TableCompositionEditorSamplePropertiesEditionProvider(); + public Adapter createSampleAdapter() { + return new SamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTotalSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextSampleWithTwoTabsAdapter() * */ - public Adapter createTotalSampleAdapter() { - return new TotalSamplePropertiesEditionProvider(); + public Adapter createTextSampleWithTwoTabsAdapter() { + return new TextSampleWithTwoTabsPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createEMFComboViewerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTableCompositionExtensionEditorSampleAdapter() * */ - public Adapter createEMFComboViewerSampleAdapter() { - return new EMFComboViewerSamplePropertiesEditionProvider(); + public Adapter createTableCompositionExtensionEditorSampleAdapter() { + return new TableCompositionExtensionEditorSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAbstractSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createNamedElementAdapter() * */ - public Adapter createAbstractSampleAdapter() { - return new AbstractSamplePropertiesEditionProvider(); + public Adapter createNamedElementAdapter() { + return new NamedElementPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createFlatReferencesTableSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createImageViewerSampleAdapter() * */ - public Adapter createFlatReferencesTableSampleAdapter() { - return new FlatReferenceTableSamplePropertiesEditionProvider(); + public Adapter createImageViewerSampleAdapter() { + return new ImageViewerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextSampleWithTwoTabsAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSelectionDialogSampleAdapter() * */ - public Adapter createTextSampleWithTwoTabsAdapter() { - return new TextSampleWithTwoTabsPropertiesEditionProvider(); + public Adapter createSelectionDialogSampleAdapter() { + return new SelectionDialogSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createAdvancedReferencesTableSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSingleCompositionViewerSampleAdapter() * */ - public Adapter createAdvancedReferencesTableSampleAdapter() { - return new AdvancedReferencesTableSamplePropertiesEditionProvider(); + public Adapter createSingleCompositionViewerSampleAdapter() { + return new SingleCompositionViewerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createTextSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.util.EefnrAdapterFactory#createSingleCompositionEditorSampleAdapter() * */ - public Adapter createTextSampleAdapter() { - return new TextSamplePropertiesEditionProvider(); + public Adapter createSingleCompositionEditorSampleAdapter() { + return new SingleCompositionEditorSamplePropertiesEditionProvider(); } } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/providers/EefnrextEEFAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/providers/EefnrextEEFAdapterFactory.java index 98934cde1..f2c702f31 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/providers/EefnrextEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/providers/EefnrextEEFAdapterFactory.java @@ -29,21 +29,19 @@ public class EefnrextEEFAdapterFactory extends EefnrextAdapterFactory { /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createFlatReferenceExtendedEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createAbstractSampleAdapter() * */ - public Adapter createFlatReferenceExtendedEditorSampleAdapter() { - List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1); - providers.add((PropertiesEditingProvider)createCheckBoxExtendedEditorSampleAdapter()); - return new FlatReferenceExtendedEditorSamplePropertiesEditionProvider(providers); + public Adapter createAbstractSampleAdapter() { + return new AbstractSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createAbstractSampleAdapter() + * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createTableCompositionTargetExtensionEditorSampleAdapter() * */ - public Adapter createAbstractSampleAdapter() { - return new AbstractSamplePropertiesEditionProvider(); + public Adapter createTableCompositionTargetExtensionEditorSampleAdapter() { + return new TableCompositionTargetExtensionEditorSamplePropertiesEditionProvider(); } /** * {@inheritDoc} @@ -57,11 +55,13 @@ public class EefnrextEEFAdapterFactory extends EefnrextAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createTableCompositionTargetExtensionEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnrext.util.EefnrextAdapterFactory#createFlatReferenceExtendedEditorSampleAdapter() * */ - public Adapter createTableCompositionTargetExtensionEditorSampleAdapter() { - return new TableCompositionTargetExtensionEditorSamplePropertiesEditionProvider(); + public Adapter createFlatReferenceExtendedEditorSampleAdapter() { + List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1); + providers.add((PropertiesEditingProvider)createCheckBoxExtendedEditorSampleAdapter()); + return new FlatReferenceExtendedEditorSamplePropertiesEditionProvider(providers); } } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/providers/FiltersEEFAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/providers/FiltersEEFAdapterFactory.java index a0f7ce57a..2e158bd45 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/providers/FiltersEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/providers/FiltersEEFAdapterFactory.java @@ -24,35 +24,35 @@ public class FiltersEEFAdapterFactory extends FiltersAdapterFactory { /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceOwnerSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createAbstractSampleAdapter() * */ - public Adapter createConcreteReferenceOwnerSampleAdapter() { - return new ConcreteReferenceOwnerSamplePropertiesEditionProvider(); + public Adapter createAbstractSampleAdapter() { + return new AbstractSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceTargetSample2Adapter() + * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceOwnerSampleAdapter() * */ - public Adapter createConcreteReferenceTargetSample2Adapter() { - return new ConcreteReferenceTargetSample2PropertiesEditionProvider(); + public Adapter createConcreteReferenceOwnerSampleAdapter() { + return new ConcreteReferenceOwnerSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createAbstractSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceTargetSample1Adapter() * */ - public Adapter createAbstractSampleAdapter() { - return new AbstractSamplePropertiesEditionProvider(); + public Adapter createConcreteReferenceTargetSample1Adapter() { + return new ConcreteReferenceTargetSample1PropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceTargetSample1Adapter() + * @see org.eclipse.emf.eef.eefnr.filters.util.FiltersAdapterFactory#createConcreteReferenceTargetSample2Adapter() * */ - public Adapter createConcreteReferenceTargetSample1Adapter() { - return new ConcreteReferenceTargetSample1PropertiesEditionProvider(); + public Adapter createConcreteReferenceTargetSample2Adapter() { + return new ConcreteReferenceTargetSample2PropertiesEditionProvider(); } } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/providers/NavigationEEFAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/providers/NavigationEEFAdapterFactory.java index 3d5e95834..bfd5fbdc5 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/providers/NavigationEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/providers/NavigationEEFAdapterFactory.java @@ -29,61 +29,63 @@ public class NavigationEEFAdapterFactory extends NavigationAdapterFactory { /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createNamedElementAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAbstractSampleAdapter() * */ - public Adapter createNamedElementAdapter() { - return new NamedElementPropertiesEditionProvider(); + public Adapter createAbstractSampleAdapter() { + return new AbstractSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createOwnerAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createDeferedFlatReferenceTableEditorSampleAdapter() * */ - public Adapter createOwnerAdapter() { - return new OwnerPropertiesEditionProvider(); + public Adapter createDeferedFlatReferenceTableEditorSampleAdapter() { + return new DeferedFlatReferencesTableSampleEditorPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createFirstModelNavigationAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createDeferedReferenceTableEditorSampleAdapter() * */ - public Adapter createFirstModelNavigationAdapter() { - return new FirstModelNavigationSamplePropertiesEditionProvider(); + public Adapter createDeferedReferenceTableEditorSampleAdapter() { + return new DeferedReferencesTableSampleEditorPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSecondModelNavigationAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createOwnerAdapter() * */ - public Adapter createSecondModelNavigationAdapter() { - return new SecondModelNavigationSamplePropertiesEditionProvider(); + public Adapter createOwnerAdapter() { + return new OwnerPropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAnotherSubTypeAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSubtypeAdapter() * */ - public Adapter createAnotherSubTypeAdapter() { + public Adapter createSubtypeAdapter() { List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1); - providers.add((PropertiesEditingProvider)createSubtypeAdapter()); - return new AnotherSubtypePropertiesEditionProvider(providers); + providers.add((PropertiesEditingProvider)createOwnerAdapter()); + return new SubtypePropertiesEditionProvider(providers); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createDeferedFlatReferenceTableEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAnotherSubTypeAdapter() * */ - public Adapter createDeferedFlatReferenceTableEditorSampleAdapter() { - return new DeferedFlatReferencesTableSampleEditorPropertiesEditionProvider(); + public Adapter createAnotherSubTypeAdapter() { + List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1); + providers.add((PropertiesEditingProvider)createSubtypeAdapter()); + return new AnotherSubtypePropertiesEditionProvider(providers); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAbstractSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createNamedElementAdapter() * */ - public Adapter createAbstractSampleAdapter() { - return new AbstractSamplePropertiesEditionProvider(); + public Adapter createNamedElementAdapter() { + return new NamedElementPropertiesEditionProvider(); } /** * {@inheritDoc} @@ -97,37 +99,35 @@ public class NavigationEEFAdapterFactory extends NavigationAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSmartModelNavigationSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAttributeNavigationSampleAdapter() * */ - public Adapter createSmartModelNavigationSampleAdapter() { - return new SmartModelNavigationSamplePropertiesEditionProvider(); + public Adapter createAttributeNavigationSampleAdapter() { + return new AttributeNavigationSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createAttributeNavigationSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSmartModelNavigationSampleAdapter() * */ - public Adapter createAttributeNavigationSampleAdapter() { - return new AttributeNavigationSamplePropertiesEditionProvider(); + public Adapter createSmartModelNavigationSampleAdapter() { + return new SmartModelNavigationSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSubtypeAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createFirstModelNavigationAdapter() * */ - public Adapter createSubtypeAdapter() { - List<PropertiesEditingProvider> providers = new ArrayList<PropertiesEditingProvider>(1); - providers.add((PropertiesEditingProvider)createOwnerAdapter()); - return new SubtypePropertiesEditionProvider(providers); + public Adapter createFirstModelNavigationAdapter() { + return new FirstModelNavigationSamplePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createDeferedReferenceTableEditorSampleAdapter() + * @see org.eclipse.emf.eef.eefnr.navigation.util.NavigationAdapterFactory#createSecondModelNavigationAdapter() * */ - public Adapter createDeferedReferenceTableEditorSampleAdapter() { - return new DeferedReferencesTableSampleEditorPropertiesEditionProvider(); + public Adapter createSecondModelNavigationAdapter() { + return new SecondModelNavigationSamplePropertiesEditionProvider(); } } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/providers/ReferencesEEFAdapterFactory.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/providers/ReferencesEEFAdapterFactory.java index 7aead10fe..384787d23 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/providers/ReferencesEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/providers/ReferencesEEFAdapterFactory.java @@ -37,14 +37,6 @@ public class ReferencesEEFAdapterFactory extends ReferencesAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.eef.eefnr.references.util.ReferencesAdapterFactory#createNamedElementAdapter() - * - */ - public Adapter createNamedElementAdapter() { - return new NamedElementPropertiesEditionProvider(); - } - /** - * {@inheritDoc} * @see org.eclipse.emf.eef.eefnr.references.util.ReferencesAdapterFactory#createAbstractEnabledSampleAdapter() * */ @@ -63,5 +55,13 @@ public class ReferencesEEFAdapterFactory extends ReferencesAdapterFactory { providers.add((PropertiesEditingProvider)createAbstractSampleAdapter()); return new ReferenceEnabledSamplePropertiesEditionProvider(providers); } + /** + * {@inheritDoc} + * @see org.eclipse.emf.eef.eefnr.references.util.ReferencesAdapterFactory#createNamedElementAdapter() + * + */ + public Adapter createNamedElementAdapter() { + return new NamedElementPropertiesEditionProvider(); + } } diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java index 785e0f093..bd720aecf 100644 --- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java +++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/providers/ConferenceEEFAdapterFactory.java @@ -22,19 +22,27 @@ public class ConferenceEEFAdapterFactory extends ConferenceAdapterFactory { /** * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createRoomAdapter() + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createConferenceAdapter() * */ - public Adapter createRoomAdapter() { - return new RoomPropertiesEditionProvider(); + public Adapter createConferenceAdapter() { + return new ConferencePropertiesEditionProvider(); } /** * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createConferenceAdapter() + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createPersonAdapter() * */ - public Adapter createConferenceAdapter() { - return new ConferencePropertiesEditionProvider(); + public Adapter createPersonAdapter() { + return new PersonPropertiesEditionProvider(); + } + /** + * {@inheritDoc} + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTalkAdapter() + * + */ + public Adapter createTalkAdapter() { + return new TalkPropertiesEditionProvider(); } /** * {@inheritDoc} @@ -54,19 +62,11 @@ public class ConferenceEEFAdapterFactory extends ConferenceAdapterFactory { } /** * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createPersonAdapter() - * - */ - public Adapter createPersonAdapter() { - return new PersonPropertiesEditionProvider(); - } - /** - * {@inheritDoc} - * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createTalkAdapter() + * @see org.eclipse.emf.samples.conference.util.ConferenceAdapterFactory#createRoomAdapter() * */ - public Adapter createTalkAdapter() { - return new TalkPropertiesEditionProvider(); + public Adapter createRoomAdapter() { + return new RoomPropertiesEditionProvider(); } } |