diff options
| author | glefur | 2010-11-12 17:09:25 +0000 |
|---|---|---|
| committer | glefur | 2010-11-12 17:09:25 +0000 |
| commit | 73c225df57a5a309051218d3a35db58d03c2069b (patch) | |
| tree | 4bb53f50ce0615fb706b5fa03230fcebc40aa0e3 /tests | |
| parent | 0f9a14757624abf96e71d62e12532f0106b9cb78 (diff) | |
| download | org.eclipse.eef-73c225df57a5a309051218d3a35db58d03c2069b.tar.gz org.eclipse.eef-73c225df57a5a309051218d3a35db58d03c2069b.tar.xz org.eclipse.eef-73c225df57a5a309051218d3a35db58d03c2069b.zip | |
ReferencesTable are no long generics
Diffstat (limited to 'tests')
40 files changed, 276 insertions, 276 deletions
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml index fa21c5636..d59c9f98b 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnr_properties.plugin.xml @@ -13,25 +13,25 @@ <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml index e8158a621..da059e8e0 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/eefnrext_properties.plugin.xml @@ -13,25 +13,25 @@ <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml index 969c64747..414ffd432 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/navigation_properties.plugin.xml @@ -13,25 +13,25 @@ <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java index 8d739567a..606962192 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent.java @@ -133,10 +133,10 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesEditionComponent exte /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java index 31e352e6a..fbcda8d38 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedReferencesTableSamplePropertiesEditionComponent.java @@ -101,8 +101,8 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin }); basePart.addFilterToAdvancedreferencestableRequiredProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for advancedreferencestableRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedreferencestableOptionalProperty(new ViewerFilter() { @@ -120,8 +120,8 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin }); basePart.addFilterToAdvancedreferencestableOptionalProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for advancedreferencestableOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -179,10 +179,10 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java index a4af2d0a3..47019db8a 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/AdvancedTableCompositionEditorSamplePropertiesEditionComponent.java @@ -96,8 +96,8 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte }); // Start of user code for additional businessfilters for advancedtablecompositionRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedtablecompositionOptionalProperty(new ViewerFilter() { @@ -112,8 +112,8 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte }); // Start of user code for additional businessfilters for advancedtablecompositionOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -171,10 +171,10 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionComponent exte /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java index 39c5a4133..a746743bd 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/CheckboxSamplePropertiesEditionComponent.java @@ -118,10 +118,10 @@ public class CheckboxSamplePropertiesEditionComponent extends SinglePartProperti /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java index 619101d15..0982ad84e 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EMFComboViewerSamplePropertiesEditionComponent.java @@ -119,10 +119,10 @@ public class EMFComboViewerSamplePropertiesEditionComponent extends SinglePartPr /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java index 2b2d62874..efceb3002 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/EObjectFlatComboViewerSamplePropertiesEditionComponent.java @@ -102,8 +102,8 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing }); // Start of user code for additional businessfilters for eobjectflatcomboviewerRequiredPropery - - // End of user code + + // End of user code basePart.addFilterToEobjectflatcomboviewerOptionalPropery(new ViewerFilter() { @@ -118,8 +118,8 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing }); // Start of user code for additional businessfilters for eobjectflatcomboviewerOptionalPropery - - // End of user code + + // End of user code } // init values for referenced views @@ -165,10 +165,10 @@ public class EObjectFlatComboViewerSamplePropertiesEditionComponent extends Sing /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java index 37f2d4b17..4ac0e9e84 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/FlatReferenceTableSamplePropertiesEditionComponent.java @@ -101,8 +101,8 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa }); basePart.addFilterToFlatreferencetableRequiredProperty(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for flatreferencetableRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToFlatreferencetableOptionalProperty(new ViewerFilter() { @@ -120,8 +120,8 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa }); basePart.addFilterToFlatreferencetableOptionalProperty(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for flatreferencetableOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -169,10 +169,10 @@ public class FlatReferenceTableSamplePropertiesEditionComponent extends SinglePa /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java index edad21eea..526612db2 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/MultiValuedEditorSamplePropertiesEditionComponent.java @@ -137,10 +137,10 @@ public class MultiValuedEditorSamplePropertiesEditionComponent extends SinglePar /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java index 56f5932d4..346c78605 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RadioSamplePropertiesEditionComponent.java @@ -119,10 +119,10 @@ public class RadioSamplePropertiesEditionComponent extends SinglePartPropertiesE /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java index e788dde17..7d27270a8 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/ReferencesTableSamplePropertiesEditionComponent.java @@ -100,8 +100,8 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP }); basePart.addFilterToReferencestableRequiredProperty(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for referencestableRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToReferencestableOptionalProperty(new ViewerFilter() { @@ -119,8 +119,8 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP }); basePart.addFilterToReferencestableOptionalProperty(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for referencestableOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -178,10 +178,10 @@ public class ReferencesTableSamplePropertiesEditionComponent extends SinglePartP /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java index 542b88fee..11deea958 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/RootPropertiesEditionComponent.java @@ -89,8 +89,8 @@ public class RootPropertiesEditionComponent extends SinglePartPropertiesEditingC }); // Start of user code for additional businessfilters for samples - - // End of user code + + // End of user code } // init values for referenced views diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java index 16eaeaf88..3a9d12112 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/SamplePropertiesEditionComponent.java @@ -130,10 +130,10 @@ public class SamplePropertiesEditionComponent extends SinglePartPropertiesEditin /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.Sample.Properties.textRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java index 4cdac06d7..d34f10fcc 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionEditorSamplePropertiesEditionComponent.java @@ -96,8 +96,8 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing }); // Start of user code for additional businessfilters for tablecompositionRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToTablecompositionOptionalProperty(new ViewerFilter() { @@ -112,8 +112,8 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing }); // Start of user code for additional businessfilters for tablecompositionOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -171,10 +171,10 @@ public class TableCompositionEditorSamplePropertiesEditionComponent extends Sing /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java index 7a6c5177a..a136aab2b 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TableCompositionExtensionEditorSamplePropertiesEditionComponent.java @@ -96,8 +96,8 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext }); // Start of user code for additional businessfilters for tablecompositionRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToTablecompositionOptionalProperty(new ViewerFilter() { @@ -112,8 +112,8 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext }); // Start of user code for additional businessfilters for tablecompositionOptionalProperty - - // End of user code + + // End of user code } // init values for referenced views @@ -171,10 +171,10 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionComponent ext /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java index 2c06f22c1..98f217950 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSamplePropertiesEditionComponent.java @@ -130,10 +130,10 @@ public class TextSamplePropertiesEditionComponent extends SinglePartPropertiesEd /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TextSample.Properties.textRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java index 81d7973ee..f4cb9a0b1 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent.java @@ -130,10 +130,10 @@ public class TextSampleWithTwoTabsTextSampleFirstTabPropertiesEditionComponent e /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab || key == EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java index 4680fb1ed..26d8acaab 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent.java @@ -130,10 +130,10 @@ public class TextSampleWithTwoTabsTextSampleSecondTabPropertiesEditionComponent /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab || key == EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java index dc57966e8..fcd26d956 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TextareaSamplePropertiesEditionComponent.java @@ -128,10 +128,10 @@ public class TextareaSamplePropertiesEditionComponent extends SinglePartProperti /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java index 433bd5cb6..a32930332 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/components/TotalSamplePropertiesEditionComponent.java @@ -228,8 +228,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for eobjectflatcomboviewerRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToEobjectflatcomboviewerOptionalProperty(new ViewerFilter() { @@ -244,8 +244,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for eobjectflatcomboviewerOptionalProperty - - // End of user code + + // End of user code basePart.addFilterToReferencestableRequiredProperty(new ViewerFilter() { @@ -263,8 +263,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); basePart.addFilterToReferencestableRequiredProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for referencestableRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToReferencestableOptionalProperty(new ViewerFilter() { @@ -282,8 +282,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); basePart.addFilterToReferencestableOptionalProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for referencestableOptionalProperty - - // End of user code + + // End of user code @@ -302,8 +302,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for tablecompositionRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToTablecompositionOptionalProperty(new ViewerFilter() { @@ -318,8 +318,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for tablecompositionOptionalProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedreferencestableRequiredProperty(new ViewerFilter() { @@ -337,8 +337,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); basePart.addFilterToAdvancedreferencestableRequiredProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for advancedreferencestableRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedreferencestableOptionalProperty(new ViewerFilter() { @@ -356,8 +356,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); basePart.addFilterToAdvancedreferencestableOptionalProperty(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for advancedreferencestableOptionalProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedeobjectflatcomboviewerRequiredPropery(new ViewerFilter() { @@ -372,8 +372,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for advancedeobjectflatcomboviewerRequiredPropery - - // End of user code + + // End of user code basePart.addFilterToAdvancedeobjectflatcomboviewerOptionalPropery(new ViewerFilter() { @@ -388,8 +388,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for advancedeobjectflatcomboviewerOptionalPropery - - // End of user code + + // End of user code basePart.addFilterToAdvancedtablecompositionRequiredProperty(new ViewerFilter() { @@ -404,8 +404,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for advancedtablecompositionRequiredProperty - - // End of user code + + // End of user code basePart.addFilterToAdvancedtablecompositionOptionalProperty(new ViewerFilter() { @@ -420,8 +420,8 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE }); // Start of user code for additional businessfilters for advancedtablecompositionOptionalProperty - - // End of user code + + // End of user code } @@ -701,10 +701,10 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrViewsRepository.TotalSample.Properties.textRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty || key == EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery || key == EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java index 95c04b523..ed04da09e 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedReferencesTableSamplePropertiesEditionPartForm.java @@ -56,10 +56,10 @@ import org.eclipse.ui.forms.widgets.Section; */ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, AdvancedReferencesTableSamplePropertiesEditionPart { - protected ReferencesTable<? extends EObject> advancedreferencestableRequiredProperty; + protected ReferencesTable advancedreferencestableRequiredProperty; protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableOptionalProperty; + protected ReferencesTable advancedreferencestableOptionalProperty; protected List<ViewerFilter> advancedreferencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -145,9 +145,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp * */ protected Composite createAdvancedreferencestableRequiredPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.advancedreferencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableRequiredProperty = new ReferencesTable(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -180,7 +180,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void moveAdvancedreferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableRequiredProperty.refresh(); } @@ -188,7 +188,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void removeFromAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableRequiredProperty.refresh(); } @@ -196,7 +196,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void editAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void editAdvancedreferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -212,9 +212,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp * */ protected Composite createAdvancedreferencestableOptionalPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.advancedreferencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableOptionalProperty = new ReferencesTable(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -247,7 +247,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void moveAdvancedreferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableOptionalProperty.refresh(); } @@ -255,7 +255,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void removeFromAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableOptionalProperty.refresh(); } @@ -263,7 +263,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartForm extends Comp /** * */ - protected void editAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void editAdvancedreferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java index 1c73adeea..29d52982a 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.java @@ -54,10 +54,10 @@ import org.eclipse.ui.forms.widgets.Section; */ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, AdvancedTableCompositionEditorSamplePropertiesEditionPart { - protected ReferencesTable<? extends EObject> advancedtablecompositionRequiredProperty; + protected ReferencesTable advancedtablecompositionRequiredProperty; protected List<ViewerFilter> advancedtablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedtablecompositionOptionalProperty; + protected ReferencesTable advancedtablecompositionOptionalProperty; protected List<ViewerFilter> advancedtablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -144,7 +144,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten * */ protected Composite createAdvancedtablecompositionRequiredPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.advancedtablecompositionRequiredProperty = new ReferencesTable<Sample>(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionRequiredProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionRequiredProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -166,7 +166,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void moveAdvancedtablecompositionRequiredProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionRequiredProperty.refresh(); } @@ -192,7 +192,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void removeFromAdvancedtablecompositionRequiredProperty(Sample element) { + protected void removeFromAdvancedtablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionRequiredProperty.refresh(); @@ -201,7 +201,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void editAdvancedtablecompositionRequiredProperty(Sample element) { + protected void editAdvancedtablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -218,7 +218,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten * */ protected Composite createAdvancedtablecompositionOptionalPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.advancedtablecompositionOptionalProperty = new ReferencesTable<Sample>(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionOptionalProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionOptionalProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -240,7 +240,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void moveAdvancedtablecompositionOptionalProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionOptionalProperty.refresh(); } @@ -266,7 +266,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void removeFromAdvancedtablecompositionOptionalProperty(Sample element) { + protected void removeFromAdvancedtablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionOptionalProperty.refresh(); @@ -275,7 +275,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartForm exten /** * */ - protected void editAdvancedtablecompositionOptionalProperty(Sample element) { + protected void editAdvancedtablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java index c4afa9d72..f4d6b4190 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/RootPropertiesEditionPartForm.java @@ -55,7 +55,7 @@ import org.eclipse.ui.forms.widgets.Section; */ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, RootPropertiesEditionPart { - protected ReferencesTable<? extends EObject> samples; + protected ReferencesTable samples; protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); @@ -139,7 +139,7 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar * */ protected Composite createSamplesTableComposition(FormToolkit widgetFactory, Composite parent) { - this.samples = new ReferencesTable<AbstractSample>(EefnrMessages.RootPropertiesEditionPart_SamplesLabel, new ReferencesTableListener<AbstractSample>() { + this.samples = new ReferencesTable(EefnrMessages.RootPropertiesEditionPart_SamplesLabel, new ReferencesTableListener<AbstractSample>() { public void handleAdd() { addToSamples();} public void handleEdit(AbstractSample element) { editSamples(element); } public void handleMove(AbstractSample element, int oldIndex, int newIndex) { moveSamples(element, oldIndex, newIndex); } @@ -161,7 +161,7 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar /** * */ - protected void moveSamples(AbstractSample element, int oldIndex, int newIndex) { + protected void moveSamples(EObject element, int oldIndex, int newIndex) { } /** @@ -187,7 +187,7 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar /** * */ - protected void removeFromSamples(AbstractSample element) { + protected void removeFromSamples(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartForm.this, EefnrViewsRepository.Root.Properties.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); samples.refresh(); @@ -196,7 +196,7 @@ public class RootPropertiesEditionPartForm extends CompositePropertiesEditionPar /** * */ - protected void editSamples(AbstractSample element) { + protected void editSamples(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java index 68345ee9d..819ff0d8b 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/forms/TableCompositionExtensionEditorSamplePropertiesEditionPartForm.java @@ -65,10 +65,10 @@ import org.eclipse.ui.forms.widgets.Section; public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, TableCompositionExtensionEditorSamplePropertiesEditionPart { protected Text name; - protected ReferencesTable<? extends EObject> tablecompositionRequiredProperty; + protected ReferencesTable tablecompositionRequiredProperty; protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> tablecompositionOptionalProperty; + protected ReferencesTable tablecompositionOptionalProperty; protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -199,7 +199,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte * */ protected Composite createTablecompositionRequiredPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.tablecompositionRequiredProperty = new ReferencesTable<AbstractTableCompositionTargetExtensionEditorSample>(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionRequiredPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { + this.tablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionRequiredPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { public void handleAdd() { addToTablecompositionRequiredProperty();} public void handleEdit(AbstractTableCompositionTargetExtensionEditorSample element) { editTablecompositionRequiredProperty(element); } public void handleMove(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { moveTablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -221,7 +221,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void moveTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { + protected void moveTablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { } /** @@ -247,7 +247,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void removeFromTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void removeFromTablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TableCompositionExtensionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); tablecompositionRequiredProperty.refresh(); @@ -256,7 +256,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void editTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void editTablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -273,7 +273,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte * */ protected Composite createTablecompositionOptionalPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.tablecompositionOptionalProperty = new ReferencesTable<AbstractTableCompositionTargetExtensionEditorSample>(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionOptionalPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { + this.tablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionOptionalPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { public void handleAdd() { addToTablecompositionOptionalProperty();} public void handleEdit(AbstractTableCompositionTargetExtensionEditorSample element) { editTablecompositionOptionalProperty(element); } public void handleMove(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { moveTablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -295,7 +295,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void moveTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { + protected void moveTablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { } /** @@ -321,7 +321,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void removeFromTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void removeFromTablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TableCompositionExtensionEditorSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); tablecompositionOptionalProperty.refresh(); @@ -330,7 +330,7 @@ public class TableCompositionExtensionEditorSamplePropertiesEditionPartForm exte /** * */ - protected void editTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void editTablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { 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 bff53d827..773c49e75 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 @@ -104,10 +104,10 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi protected EMFComboViewer radioOptionalProperty; protected EObjectFlatComboViewer eobjectflatcomboviewerRequiredProperty; protected EObjectFlatComboViewer eobjectflatcomboviewerOptionalProperty; - protected ReferencesTable<? extends EObject> referencestableRequiredProperty; + protected ReferencesTable referencestableRequiredProperty; protected List<ViewerFilter> referencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> referencestableOptionalProperty; + protected ReferencesTable referencestableOptionalProperty; protected List<ViewerFilter> referencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected EMFComboViewer emfcomboviewerRequiredProperty; @@ -124,18 +124,18 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi protected TableViewer tablecompositionOptionalProperty; protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableRequiredProperty; + protected ReferencesTable advancedreferencestableRequiredProperty; protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableOptionalProperty; + protected ReferencesTable advancedreferencestableOptionalProperty; protected List<ViewerFilter> advancedreferencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected EObjectFlatComboViewer advancedeobjectflatcomboviewerRequiredPropery; protected EObjectFlatComboViewer advancedeobjectflatcomboviewerOptionalPropery; - protected ReferencesTable<? extends EObject> advancedtablecompositionRequiredProperty; + protected ReferencesTable advancedtablecompositionRequiredProperty; protected List<ViewerFilter> advancedtablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedtablecompositionOptionalProperty; + protected ReferencesTable advancedtablecompositionOptionalProperty; protected List<ViewerFilter> advancedtablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected Text name; @@ -638,9 +638,9 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createReferencestableRequiredPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.referencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.referencestableRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableRequiredPropertyFilters, referencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableRequiredPropertyFilters, referencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -673,7 +673,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveReferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveReferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); referencestableRequiredProperty.refresh(); } @@ -681,7 +681,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromReferencestableRequiredProperty(TotalSample element) { + protected void removeFromReferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); referencestableRequiredProperty.refresh(); } @@ -689,7 +689,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editReferencestableRequiredProperty(TotalSample element) { + protected void editReferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -705,9 +705,9 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createReferencestableOptionalPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.referencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.referencestableOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableOptionalPropertyFilters, referencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableOptionalPropertyFilters, referencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -740,7 +740,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveReferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveReferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); referencestableOptionalProperty.refresh(); } @@ -748,7 +748,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromReferencestableOptionalProperty(TotalSample element) { + protected void removeFromReferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); referencestableOptionalProperty.refresh(); } @@ -756,7 +756,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editReferencestableOptionalProperty(TotalSample element) { + protected void editReferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1310,9 +1310,9 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createAdvancedreferencestableRequiredPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.advancedreferencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -1345,7 +1345,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveAdvancedreferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableRequiredProperty.refresh(); } @@ -1353,7 +1353,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableRequiredProperty.refresh(); } @@ -1361,7 +1361,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void editAdvancedreferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1377,9 +1377,9 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createAdvancedreferencestableOptionalPropertyReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.advancedreferencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -1412,7 +1412,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveAdvancedreferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableOptionalProperty.refresh(); } @@ -1420,7 +1420,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableOptionalProperty.refresh(); } @@ -1428,7 +1428,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void editAdvancedreferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1503,7 +1503,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createAdvancedtablecompositionRequiredPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.advancedtablecompositionRequiredProperty = new ReferencesTable<Sample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionRequiredProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionRequiredProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -1525,7 +1525,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveAdvancedtablecompositionRequiredProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionRequiredProperty.refresh(); } @@ -1551,7 +1551,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromAdvancedtablecompositionRequiredProperty(Sample element) { + protected void removeFromAdvancedtablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionRequiredProperty.refresh(); @@ -1560,7 +1560,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editAdvancedtablecompositionRequiredProperty(Sample element) { + protected void editAdvancedtablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1577,7 +1577,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi * */ protected Composite createAdvancedtablecompositionOptionalPropertyTableComposition(FormToolkit widgetFactory, Composite parent) { - this.advancedtablecompositionOptionalProperty = new ReferencesTable<Sample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionOptionalProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionOptionalProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -1599,7 +1599,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void moveAdvancedtablecompositionOptionalProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionOptionalProperty.refresh(); } @@ -1625,7 +1625,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void removeFromAdvancedtablecompositionOptionalProperty(Sample element) { + protected void removeFromAdvancedtablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartForm.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionOptionalProperty.refresh(); @@ -1634,7 +1634,7 @@ public class TotalSamplePropertiesEditionPartForm extends CompositePropertiesEdi /** * */ - protected void editAdvancedtablecompositionOptionalProperty(Sample element) { + protected void editAdvancedtablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java index 9788460f9..e8a689040 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedReferencesTableSamplePropertiesEditionPartImpl.java @@ -55,10 +55,10 @@ import org.eclipse.swt.widgets.Group; */ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, AdvancedReferencesTableSamplePropertiesEditionPart { - protected ReferencesTable<? extends EObject> advancedreferencestableRequiredProperty; + protected ReferencesTable advancedreferencestableRequiredProperty; protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableOptionalProperty; + protected ReferencesTable advancedreferencestableOptionalProperty; protected List<ViewerFilter> advancedreferencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -141,9 +141,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp * */ protected Composite createAdvancedreferencestableRequiredPropertyAdvancedReferencesTable(Composite parent) { - this.advancedreferencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableRequiredProperty = new ReferencesTable(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -177,7 +177,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void moveAdvancedreferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableRequiredProperty.refresh(); } @@ -185,7 +185,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void removeFromAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableRequiredProperty.refresh(); } @@ -193,7 +193,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void editAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void editAdvancedreferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -209,9 +209,9 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp * */ protected Composite createAdvancedreferencestableOptionalPropertyAdvancedReferencesTable(Composite parent) { - this.advancedreferencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableOptionalProperty = new ReferencesTable(EefnrMessages.AdvancedReferencesTableSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -245,7 +245,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void moveAdvancedreferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableOptionalProperty.refresh(); } @@ -253,7 +253,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void removeFromAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedReferencesTableSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableOptionalProperty.refresh(); } @@ -261,7 +261,7 @@ public class AdvancedReferencesTableSamplePropertiesEditionPartImpl extends Comp /** * */ - protected void editAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void editAdvancedreferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java index 67cc03e34..e16a301c1 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.java @@ -53,10 +53,10 @@ import org.eclipse.swt.widgets.Group; */ public class AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, AdvancedTableCompositionEditorSamplePropertiesEditionPart { -protected ReferencesTable<? extends EObject> advancedtablecompositionRequiredProperty; +protected ReferencesTable advancedtablecompositionRequiredProperty; protected List<ViewerFilter> advancedtablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); -protected ReferencesTable<? extends EObject> advancedtablecompositionOptionalProperty; +protected ReferencesTable advancedtablecompositionOptionalProperty; protected List<ViewerFilter> advancedtablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -140,7 +140,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedtablecompositionRequiredPropertyAdvancedTableComposition(Composite parent) { - this.advancedtablecompositionRequiredProperty = new ReferencesTable<Sample>(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionRequiredProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionRequiredProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -162,7 +162,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedtablecompositionRequiredProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionRequiredProperty.refresh(); } @@ -188,7 +188,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedtablecompositionRequiredProperty(Sample element) { + protected void removeFromAdvancedtablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionRequiredProperty.refresh(); @@ -197,7 +197,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedtablecompositionRequiredProperty(Sample element) { + protected void editAdvancedtablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -214,7 +214,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedtablecompositionOptionalPropertyAdvancedTableComposition(Composite parent) { - this.advancedtablecompositionOptionalProperty = new ReferencesTable<Sample>(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.AdvancedTableCompositionEditorSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionOptionalProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionOptionalProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -236,7 +236,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedtablecompositionOptionalProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionOptionalProperty.refresh(); } @@ -262,7 +262,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedtablecompositionOptionalProperty(Sample element) { + protected void removeFromAdvancedtablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(AdvancedTableCompositionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionOptionalProperty.refresh(); @@ -271,7 +271,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedtablecompositionOptionalProperty(Sample element) { + protected void editAdvancedtablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java index 753ce811f..f33be214b 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/RootPropertiesEditionPartImpl.java @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Group; */ public class RootPropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, RootPropertiesEditionPart { -protected ReferencesTable<? extends EObject> samples; +protected ReferencesTable samples; protected List<ViewerFilter> samplesBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); @@ -135,7 +135,7 @@ protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); * */ protected Composite createSamplesAdvancedTableComposition(Composite parent) { - this.samples = new ReferencesTable<AbstractSample>(EefnrMessages.RootPropertiesEditionPart_SamplesLabel, new ReferencesTableListener<AbstractSample>() { + this.samples = new ReferencesTable(EefnrMessages.RootPropertiesEditionPart_SamplesLabel, new ReferencesTableListener<AbstractSample>() { public void handleAdd() { addToSamples();} public void handleEdit(AbstractSample element) { editSamples(element); } public void handleMove(AbstractSample element, int oldIndex, int newIndex) { moveSamples(element, oldIndex, newIndex); } @@ -157,7 +157,7 @@ protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); /** * */ - protected void moveSamples(AbstractSample element, int oldIndex, int newIndex) { + protected void moveSamples(EObject element, int oldIndex, int newIndex) { } /** @@ -183,7 +183,7 @@ protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); /** * */ - protected void removeFromSamples(AbstractSample element) { + protected void removeFromSamples(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(RootPropertiesEditionPartImpl.this, EefnrViewsRepository.Root.Properties.samples, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); samples.refresh(); @@ -192,7 +192,7 @@ protected List<ViewerFilter> samplesFilters = new ArrayList<ViewerFilter>(); /** * */ - protected void editSamples(AbstractSample element) { + protected void editSamples(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java index 1c5c6033b..f13260151 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/parts/impl/TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.java @@ -63,10 +63,10 @@ import org.eclipse.swt.widgets.Text; public class TableCompositionExtensionEditorSamplePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, TableCompositionExtensionEditorSamplePropertiesEditionPart { protected Text name; -protected ReferencesTable<? extends EObject> tablecompositionRequiredProperty; +protected ReferencesTable tablecompositionRequiredProperty; protected List<ViewerFilter> tablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); -protected ReferencesTable<? extends EObject> tablecompositionOptionalProperty; +protected ReferencesTable tablecompositionOptionalProperty; protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); @@ -200,7 +200,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array * */ protected Composite createTablecompositionRequiredPropertyAdvancedTableComposition(Composite parent) { - this.tablecompositionRequiredProperty = new ReferencesTable<AbstractTableCompositionTargetExtensionEditorSample>(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionRequiredPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { + this.tablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionRequiredPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { public void handleAdd() { addToTablecompositionRequiredProperty();} public void handleEdit(AbstractTableCompositionTargetExtensionEditorSample element) { editTablecompositionRequiredProperty(element); } public void handleMove(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { moveTablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -222,7 +222,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void moveTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { + protected void moveTablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { } /** @@ -248,7 +248,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void removeFromTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void removeFromTablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); tablecompositionRequiredProperty.refresh(); @@ -257,7 +257,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void editTablecompositionRequiredProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void editTablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -274,7 +274,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array * */ protected Composite createTablecompositionOptionalPropertyAdvancedTableComposition(Composite parent) { - this.tablecompositionOptionalProperty = new ReferencesTable<AbstractTableCompositionTargetExtensionEditorSample>(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionOptionalPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { + this.tablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.TableCompositionExtensionEditorSamplePropertiesEditionPart_TablecompositionOptionalPropertyLabel, new ReferencesTableListener<AbstractTableCompositionTargetExtensionEditorSample>() { public void handleAdd() { addToTablecompositionOptionalProperty();} public void handleEdit(AbstractTableCompositionTargetExtensionEditorSample element) { editTablecompositionOptionalProperty(element); } public void handleMove(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { moveTablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -296,7 +296,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void moveTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element, int oldIndex, int newIndex) { + protected void moveTablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { } /** @@ -322,7 +322,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void removeFromTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void removeFromTablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TableCompositionExtensionEditorSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TableCompositionExtensionEditorSample.Properties.tablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); tablecompositionOptionalProperty.refresh(); @@ -331,7 +331,7 @@ protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new Array /** * */ - protected void editTablecompositionOptionalProperty(AbstractTableCompositionTargetExtensionEditorSample element) { + protected void editTablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { 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 42bc1927d..10a54bf5a 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 @@ -102,10 +102,10 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi protected EMFComboViewer radioOptionalProperty; protected EObjectFlatComboViewer eobjectflatcomboviewerRequiredProperty; protected EObjectFlatComboViewer eobjectflatcomboviewerOptionalProperty; - protected ReferencesTable<? extends EObject> referencestableRequiredProperty; + protected ReferencesTable referencestableRequiredProperty; protected List<ViewerFilter> referencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> referencestableOptionalProperty; + protected ReferencesTable referencestableOptionalProperty; protected List<ViewerFilter> referencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected EMFComboViewer emfcomboviewerRequiredProperty; @@ -122,18 +122,18 @@ public class TotalSamplePropertiesEditionPartImpl extends CompositePropertiesEdi protected TableViewer tablecompositionOptionalProperty; protected List<ViewerFilter> tablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> tablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableRequiredProperty; + protected ReferencesTable advancedreferencestableRequiredProperty; protected List<ViewerFilter> advancedreferencestableRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableRequiredPropertyFilters = new ArrayList<ViewerFilter>(); - protected ReferencesTable<? extends EObject> advancedreferencestableOptionalProperty; + protected ReferencesTable advancedreferencestableOptionalProperty; protected List<ViewerFilter> advancedreferencestableOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedreferencestableOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected EObjectFlatComboViewer advancedeobjectflatcomboviewerRequiredPropery; protected EObjectFlatComboViewer advancedeobjectflatcomboviewerOptionalPropery; -protected ReferencesTable<? extends EObject> advancedtablecompositionRequiredProperty; +protected ReferencesTable advancedtablecompositionRequiredProperty; protected List<ViewerFilter> advancedtablecompositionRequiredPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionRequiredPropertyFilters = new ArrayList<ViewerFilter>(); -protected ReferencesTable<? extends EObject> advancedtablecompositionOptionalProperty; +protected ReferencesTable advancedtablecompositionOptionalProperty; protected List<ViewerFilter> advancedtablecompositionOptionalPropertyBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = new ArrayList<ViewerFilter>(); protected Text name; @@ -647,9 +647,9 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createReferencestableRequiredPropertyAdvancedReferencesTable(Composite parent) { - this.referencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.referencestableRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableRequiredPropertyFilters, referencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, referencestableRequiredPropertyFilters, referencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -683,7 +683,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveReferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveReferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); referencestableRequiredProperty.refresh(); } @@ -691,7 +691,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromReferencestableRequiredProperty(TotalSample element) { + protected void removeFromReferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); referencestableRequiredProperty.refresh(); } @@ -699,7 +699,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editReferencestableRequiredProperty(TotalSample element) { + protected void editReferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -715,9 +715,9 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createReferencestableOptionalPropertyAdvancedReferencesTable(Composite parent) { - this.referencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.referencestableOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_ReferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referencestableOptionalPropertyFilters, referencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, referencestableOptionalPropertyFilters, referencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -751,7 +751,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveReferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveReferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); referencestableOptionalProperty.refresh(); } @@ -759,7 +759,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromReferencestableOptionalProperty(TotalSample element) { + protected void removeFromReferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); referencestableOptionalProperty.refresh(); } @@ -767,7 +767,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editReferencestableOptionalProperty(TotalSample element) { + protected void editReferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1319,9 +1319,9 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedreferencestableRequiredPropertyAdvancedReferencesTable(Composite parent) { - this.advancedreferencestableRequiredProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableRequiredPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, advancedreferencestableRequiredPropertyFilters, advancedreferencestableRequiredPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -1355,7 +1355,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedreferencestableRequiredProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableRequiredProperty.refresh(); } @@ -1363,7 +1363,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableRequiredProperty.refresh(); } @@ -1371,7 +1371,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedreferencestableRequiredProperty(TotalSample element) { + protected void editAdvancedreferencestableRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1387,9 +1387,9 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedreferencestableOptionalPropertyAdvancedReferencesTable(Composite parent) { - this.advancedreferencestableOptionalProperty = new ReferencesTable<TotalSample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { + this.advancedreferencestableOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedreferencestableOptionalPropertyLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, advancedreferencestableOptionalPropertyFilters, advancedreferencestableOptionalPropertyBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -1423,7 +1423,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedreferencestableOptionalProperty(TotalSample element, int oldIndex, int newIndex) { + protected void moveAdvancedreferencestableOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedreferencestableOptionalProperty.refresh(); } @@ -1431,7 +1431,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void removeFromAdvancedreferencestableOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedreferencestableOptionalProperty.refresh(); } @@ -1439,7 +1439,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedreferencestableOptionalProperty(TotalSample element) { + protected void editAdvancedreferencestableOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1502,7 +1502,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedtablecompositionRequiredPropertyAdvancedTableComposition(Composite parent) { - this.advancedtablecompositionRequiredProperty = new ReferencesTable<Sample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionRequiredProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionRequiredPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionRequiredProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionRequiredProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionRequiredProperty(element, oldIndex, newIndex); } @@ -1524,7 +1524,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedtablecompositionRequiredProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionRequiredProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionRequiredProperty.refresh(); } @@ -1550,7 +1550,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedtablecompositionRequiredProperty(Sample element) { + protected void removeFromAdvancedtablecompositionRequiredProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionRequiredProperty.refresh(); @@ -1559,7 +1559,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedtablecompositionRequiredProperty(Sample element) { + protected void editAdvancedtablecompositionRequiredProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { @@ -1576,7 +1576,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n * */ protected Composite createAdvancedtablecompositionOptionalPropertyAdvancedTableComposition(Composite parent) { - this.advancedtablecompositionOptionalProperty = new ReferencesTable<Sample>(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { + this.advancedtablecompositionOptionalProperty = new ReferencesTable(EefnrMessages.TotalSamplePropertiesEditionPart_AdvancedtablecompositionOptionalPropertyLabel, new ReferencesTableListener<Sample>() { public void handleAdd() { addToAdvancedtablecompositionOptionalProperty();} public void handleEdit(Sample element) { editAdvancedtablecompositionOptionalProperty(element); } public void handleMove(Sample element, int oldIndex, int newIndex) { moveAdvancedtablecompositionOptionalProperty(element, oldIndex, newIndex); } @@ -1598,7 +1598,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void moveAdvancedtablecompositionOptionalProperty(Sample element, int oldIndex, int newIndex) { + protected void moveAdvancedtablecompositionOptionalProperty(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); advancedtablecompositionOptionalProperty.refresh(); } @@ -1624,7 +1624,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void removeFromAdvancedtablecompositionOptionalProperty(Sample element) { + protected void removeFromAdvancedtablecompositionOptionalProperty(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(TotalSamplePropertiesEditionPartImpl.this, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); advancedtablecompositionOptionalProperty.refresh(); @@ -1633,7 +1633,7 @@ protected List<ViewerFilter> advancedtablecompositionOptionalPropertyFilters = n /** * */ - protected void editAdvancedtablecompositionOptionalProperty(Sample element) { + protected void editAdvancedtablecompositionOptionalProperty(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java index d8fd174eb..b79e57c43 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/forms/ReferenceEnabledSamplePropertiesEditionPartForm.java @@ -60,7 +60,7 @@ import org.eclipse.ui.forms.widgets.Section; */ public class ReferenceEnabledSamplePropertiesEditionPartForm extends CompositePropertiesEditionPart implements IFormPropertiesEditionPart, ReferenceEnabledSamplePropertiesEditionPart { - protected ReferencesTable<? extends EObject> reference; + protected ReferencesTable reference; protected List<ViewerFilter> referenceBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referenceFilters = new ArrayList<ViewerFilter>(); private AbstractEnabledSamplePropertiesEditionPart abstractEnabledSamplePropertiesEditionPart; @@ -148,9 +148,9 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends CompositePr * */ protected Composite createReferenceReferencesTable(FormToolkit widgetFactory, Composite parent) { - this.reference = new ReferencesTable<TotalSample>(ReferencesMessages.ReferenceEnabledSamplePropertiesEditionPart_ReferenceLabel, new ReferencesTableListener<TotalSample>() { + this.reference = new ReferencesTable(ReferencesMessages.ReferenceEnabledSamplePropertiesEditionPart_ReferenceLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referenceFilters, referenceBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referenceFilters, referenceBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { @Override public void process(IStructuredSelection selection) { @@ -183,7 +183,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends CompositePr /** * */ - protected void moveReference(TotalSample element, int oldIndex, int newIndex) { + protected void moveReference(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferenceEnabledSamplePropertiesEditionPartForm.this, ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); reference.refresh(); } @@ -191,7 +191,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends CompositePr /** * */ - protected void removeFromReference(TotalSample element) { + protected void removeFromReference(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferenceEnabledSamplePropertiesEditionPartForm.this, ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); reference.refresh(); } @@ -199,7 +199,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartForm extends CompositePr /** * */ - protected void editReference(TotalSample element) { + protected void editReference(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java index 02d94d8b0..920461bd8 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnr/references/parts/impl/ReferenceEnabledSamplePropertiesEditionPartImpl.java @@ -59,7 +59,7 @@ import org.eclipse.swt.widgets.Group; */ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePropertiesEditionPart implements ISWTPropertiesEditionPart, ReferenceEnabledSamplePropertiesEditionPart { - protected ReferencesTable<? extends EObject> reference; + protected ReferencesTable reference; protected List<ViewerFilter> referenceBusinessFilters = new ArrayList<ViewerFilter>(); protected List<ViewerFilter> referenceFilters = new ArrayList<ViewerFilter>(); private AbstractEnabledSamplePropertiesEditionPart abstractEnabledSamplePropertiesEditionPart; @@ -144,9 +144,9 @@ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePr * */ protected Composite createReferenceAdvancedReferencesTable(Composite parent) { - this.reference = new ReferencesTable<TotalSample>(ReferencesMessages.ReferenceEnabledSamplePropertiesEditionPart_ReferenceLabel, new ReferencesTableListener<TotalSample>() { + this.reference = new ReferencesTable(ReferencesMessages.ReferenceEnabledSamplePropertiesEditionPart_ReferenceLabel, new ReferencesTableListener<TotalSample>() { public void handleAdd() { - TabElementTreeSelectionDialog<TotalSample> dialog = new TabElementTreeSelectionDialog<TotalSample>(resourceSet, referenceFilters, referenceBusinessFilters, + TabElementTreeSelectionDialog dialog = new TabElementTreeSelectionDialog(resourceSet, referenceFilters, referenceBusinessFilters, "TotalSample", EefnrPackage.eINSTANCE.getTotalSample(), current.eResource()) { public void process(IStructuredSelection selection) { @@ -180,7 +180,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePr /** * */ - protected void moveReference(TotalSample element, int oldIndex, int newIndex) { + protected void moveReference(EObject element, int oldIndex, int newIndex) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferenceEnabledSamplePropertiesEditionPartImpl.this, ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.MOVE, element, newIndex)); reference.refresh(); } @@ -188,7 +188,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePr /** * */ - protected void removeFromReference(TotalSample element) { + protected void removeFromReference(EObject element) { propertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferenceEnabledSamplePropertiesEditionPartImpl.this, ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference, PropertiesEditionEvent.COMMIT, PropertiesEditionEvent.REMOVE, null, element)); reference.refresh(); } @@ -196,7 +196,7 @@ public class ReferenceEnabledSamplePropertiesEditionPartImpl extends CompositePr /** * */ - protected void editReference(TotalSample element) { + protected void editReference(EObject element) { EObjectPropertiesEditionContext context = new EObjectPropertiesEditionContext(propertiesEditionComponent.getEditingContext(), propertiesEditionComponent, element, adapterFactory); PropertiesEditingProvider provider = (PropertiesEditingProvider)adapterFactory.adapt(element, PropertiesEditingProvider.class); if (provider != null) { diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java index fc508613a..daf53fb64 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent.java @@ -97,8 +97,8 @@ public class FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent ext }); basePart.addFilterToFlatReferenceEditorSample(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getAbstractSample())); // Start of user code for additional businessfilters for flatReferenceEditorSample - - // End of user code + + // End of user code } // init values for referenced views @@ -141,10 +141,10 @@ public class FlatReferenceExtendedEditorSampleBasePropertiesEditionComponent ext /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java index f82187928..730428734 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/eefnrext/components/FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorSamplePropertiesEditionComponent.java @@ -129,10 +129,10 @@ public class FlatReferenceExtendedEditorSampleSecondFlatReferenceExtendedEditorS /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == EefnrextViewsRepository.SecondFlatReferenceExtendedEditorSample.Extended.demo; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java index 857bbefcd..98ae00f8b 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent.java @@ -104,8 +104,8 @@ public class DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent ex }); deferedFlatReferencesTableSamplePart.addFilterToFlatReferencesTableSampleEditor(new EObjectStrictFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for flatReferencesTableSampleEditor - - // End of user code + + // End of user code } // init values for referenced views @@ -157,10 +157,10 @@ public class DeferedFlatReferencesTableSampleEditorPropertiesEditionComponent ex /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == NavigationViewsRepository.DeferedFlatReferencesTableSample.Properties.flatReferencesTableSampleEditor; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java index 65d45521e..1b5b4f2e7 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/DeferedReferencesTableSampleEditorPropertiesEditionComponent.java @@ -99,8 +99,8 @@ public class DeferedReferencesTableSampleEditorPropertiesEditionComponent extend }); // Start of user code for additional businessfilters for flatReferencesTableSampleEditor - - // End of user code + + // End of user code } // init values for referenced views @@ -157,10 +157,10 @@ public class DeferedReferencesTableSampleEditorPropertiesEditionComponent extend /** * {@inheritDoc} * - * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.String, int) + * @see org.eclipse.emf.eef.runtime.impl.components.StandardPropertiesEditionComponent#isRequired(java.lang.Object, int) * */ - public boolean isRequired(String key, int kind) { + public boolean isRequired(Object key, int kind) { return key == NavigationViewsRepository.DeferedReferencesTableSample.Properties.referencesTableSampleEditor; } diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java index 1f959dcaf..6ca86dd90 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/references/components/ReferenceEnabledSampleBasePropertiesEditionComponent.java @@ -95,8 +95,8 @@ public class ReferenceEnabledSampleBasePropertiesEditionComponent extends Single }); basePart.addFilterToReference(new EObjectFilter(EefnrPackage.eINSTANCE.getTotalSample())); // Start of user code for additional businessfilters for reference - - // End of user code + + // End of user code } // init values for referenced views diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml index bdd5db97b..8add3f32a 100644 --- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml +++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/references_properties.plugin.xml @@ -13,25 +13,25 @@ <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.navigation.providers.NavigationPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnrext.providers.EefnrextPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> <extension point="org.eclipse.emf.eef.runtime.PropertiesEditionPartProvider"> <PropertiesEditionPartProvider - providerClass="org.eclipse.emf.eef.eefnr.providers.EefnrPropertiesEditionPartProvider"> + providerClass="org.eclipse.emf.eef.eefnr.references.providers.ReferencesPropertiesEditionPartProvider"> </PropertiesEditionPartProvider> </extension> |