fixed nonreg tests generation

1 files changed, 75 insertions, 204 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.xml b/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.xml
index 565f055b4..83aa22249 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.xml
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/plugin.xml
@@ -5,7 +5,7 @@
  <copyright>
  </copyright>
 
- $Id: plugin.xml,v 1.14 2011/11/16 10:11:33 sbouchet Exp $
+ $Id: plugin.xml,v 1.15 2012/03/28 09:44:32 sbouchet Exp $
 -->
 
 <plugin>
@@ -207,16 +207,15 @@
                id="Base">
          </propertyTab>
          <propertyTab
-               label="TextSampleFirstTab"
-               category="extended"
                id="TextSampleFirstTab"
-               afterTab="TextSampleFirstTab">
+               label="TextSampleFirstTab"
+               category="default">
          </propertyTab>
          <propertyTab
+               id="TextSampleSecondTab"
                label="TextSampleSecondTab"
                category="extended"
-               id="TextSampleSecondTab"
-               afterTab="Base">
+               afterTab="TextSampleFirstTab">
          </propertyTab>
       </propertyTabs>
    </extension>
@@ -226,179 +225,135 @@
             contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.RootPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.RootPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.Root"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.Root">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TotalSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TotalSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TotalSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TotalSample">
-             </input>
-         </propertySection>
+                      </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TextSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TextSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TextSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TextSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.CheckboxSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.CheckboxSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.CheckboxSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.CheckboxSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TextareaSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TextareaSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TextareaSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TextareaSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.RadioSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.RadioSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.RadioSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.RadioSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.EObjectFlatComboViewerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.EObjectFlatComboViewerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.EObjectFlatComboViewerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.EObjectFlatComboViewerSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.ReferencesTableSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.ReferencesTableSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.ReferencesTableSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.ReferencesTableSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.EMFComboViewerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.EMFComboViewerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.EMFComboViewerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.EMFComboViewerSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.MultiValuedEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.MultiValuedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.MultiValuedEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.MultiValuedEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TableCompositionEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TableCompositionEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TableCompositionEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TableCompositionEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.AdvancedReferencesTableSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.AdvancedReferencesTableSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.AdvancedReferencesTableSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.AdvancedReferencesTableSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.AdvancedEObjectFlatComboViewerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.AdvancedEObjectFlatComboViewerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.AdvancedEObjectFlatComboViewerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.AdvancedEObjectFlatComboViewerSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.AdvancedTableCompositionEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.AdvancedTableCompositionEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.AdvancedTableCompositionEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.AdvancedTableCompositionEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.FlatReferenceTableSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.FlatReferenceTableSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.FlatReferencesTableSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.FlatReferencesTableSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.SamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.SamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.Sample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.Sample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TextSampleFirstTabPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TextSampleWithTwoTabsPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TextSampleWithTwoTabs"
                tab="TextSampleFirstTab">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TextSampleWithTwoTabs">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TextSampleSecondTabPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TextSampleWithTwoTabsPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TextSampleWithTwoTabs"
                tab="TextSampleSecondTab">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TextSampleWithTwoTabs">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.TableCompositionExtensionEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.TableCompositionExtensionEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.TableCompositionExtensionEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.TableCompositionExtensionEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.ImageViewerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.ImageViewerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.ImageViewerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.ImageViewerSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.SelectionDialogSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.SelectionDialogSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.SelectionDialogSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.SelectionDialogSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.parts.forms.SingleCompositionViewerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnr.providers.SingleCompositionViewerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnr.section.SingleCompositionViewerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.SingleCompositionViewerSample">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
@@ -406,7 +361,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.eefnrext.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -422,90 +377,78 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.eefnrext.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
+               id="Base"
                label="Base"
-               category="default"
-               id="Base">
+               category="default">
          </propertyTab>
          <propertyTab
+               id="AbstractSample"
                label="AbstractSample"
                category="extended"
-               id="AbstractSample"
                afterTab="Base">
          </propertyTab>
          <propertyTab
+               id="SecondFlatReferenceExtendedEditorSample"
                label="SecondFlatReferenceExtendedEditorSample"
                category="extended"
-               id="SecondFlatReferenceExtendedEditorSample"
                afterTab="Base">
          </propertyTab>
          <propertyTab
+               id="CheckBoxExtendedEditorSample"
                label="CheckBoxExtendedEditorSample"
                category="extended"
-               id="CheckBoxExtendedEditorSample"
-               afterTab="CheckBoxExtendedEditorSample">
+               afterTab="SecondFlatReferenceExtendedEditorSample">
          </propertyTab>
       </propertyTabs>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.eefnrext.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnrext.parts.forms.TableCompositionTargetExtensionEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.TableCompositionTargetExtensionEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.TableCompositionTargetExtensionEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.TableCompositionTargetExtensionEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnrext.parts.forms.CheckBoxExtendedEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.CheckBoxExtendedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.CheckBoxExtendedEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.CheckBoxExtendedEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.references.parts.forms.AbstractSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.CheckBoxExtendedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.CheckBoxExtendedEditorSample"
                tab="AbstractSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.CheckBoxExtendedEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnrext.parts.forms.FlatReferenceExtendedEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.FlatReferenceExtendedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.FlatReferenceExtendedEditorSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.FlatReferenceExtendedEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnrext.parts.forms.SecondFlatReferenceExtendedEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.FlatReferenceExtendedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.FlatReferenceExtendedEditorSample"
                tab="SecondFlatReferenceExtendedEditorSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.FlatReferenceExtendedEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnrext.parts.forms.CheckBoxExtendedEditorSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.eefnrext.providers.FlatReferenceExtendedEditorSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.eefnrext.section.FlatReferenceExtendedEditorSample"
                tab="CheckBoxExtendedEditorSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnrext.FlatReferenceExtendedEditorSample">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.filters.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -521,7 +464,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.filters.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
                label="Base"
                category="default"
@@ -532,37 +475,31 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.filters.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.filters.parts.forms.ConcreteReferenceOwnerSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.filters.providers.ConcreteReferenceOwnerSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.filters.section.ConcreteReferenceOwnerSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceOwnerSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.filters.parts.forms.ConcreteReferenceTargetSample1PropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.filters.providers.ConcreteReferenceTargetSample1PropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.filters.section.ConcreteReferenceTargetSample1"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample1">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.filters.parts.forms.ConcreteReferenceTargetSample2PropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.filters.providers.ConcreteReferenceTargetSample2PropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.filters.section.ConcreteReferenceTargetSample2"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.filters.ConcreteReferenceTargetSample2">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.interface.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -578,7 +515,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.interface.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
                label="Base"
                category="default"
@@ -589,21 +526,19 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.interface.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.interface_.parts.forms.SimpleSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.interface_.providers.SimpleSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.interface.section.SimpleSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.interface.SimpleSample">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.naming.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -619,7 +554,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.naming.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
                label="Base"
                category="default"
@@ -630,21 +565,19 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.naming.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.EventPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.naming.providers.EventPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.naming.section.Event"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.naming.Event">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.navigation.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -660,7 +593,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.navigation.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
                label="Base"
                category="default"
@@ -701,101 +634,73 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.navigation.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.DeferedFlatReferencesTableSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.DeferedFlatReferencesTableSampleEditorPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.DeferedFlatReferenceTableEditorSample"
                tab="DeferedFlatReferencesTableSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.DeferedFlatReferenceTableEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.DeferedReferencesTableSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.DeferedReferencesTableSampleEditorPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.DeferedReferenceTableEditorSample"
                tab="DeferedReferencesTableSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.DeferedReferenceTableEditorSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.OwnerPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.OwnerPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.Owner"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.Owner">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.SubtypePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.SubtypePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.Subtype"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.Subtype">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.OwnerPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.SubtypePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.Subtype"
                tab="Owner">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.Subtype">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.AnotherSubtypePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.AnotherSubtypePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.AnotherSubType"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.AnotherSubType">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.SubtypePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.AnotherSubtypePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.AnotherSubType"
                tab="Subtype">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.AnotherSubType">
-             </input>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.NamedElementPropertiesEditionPartForm"
-               id="org.eclipse.emf.eef.eefnr.section.NamedElement"
-               tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.NamedElement">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.ElementPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.ElementPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.Element"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.Element">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.NamedElementPropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.ElementPropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.Element"
                tab="NamedElement">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.Element">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.navigation.parts.forms.AttributeNavigationSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.navigation.providers.AttributeNavigationSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.navigation.section.AttributeNavigationSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.navigation.AttributeNavigationSample">
-             </input>
          </propertySection>
       </propertySections>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
       <propertyContributor
-            contributorId="org.eclipse.emf.eef.references.properties"
+            contributorId="org.eclipse.emf.eef.eefnr.properties"
             labelProvider="org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider">
          <propertyCategory
                category="default">
@@ -811,7 +716,7 @@
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
       <propertyTabs
-            contributorId="org.eclipse.emf.eef.references.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertyTab
                label="Base"
                category="default"
@@ -823,57 +728,23 @@
                id="AbstractSample"
                afterTab="Base">
          </propertyTab>
-         <propertyTab
-               label="AbstractSample"
-               category="extended"
-               id="AbstractSample"
-               afterTab="Base">
-         </propertyTab>
       </propertyTabs>
    </extension>
    <extension
          point="org.eclipse.ui.views.properties.tabbed.propertySections">
       <propertySections
-            contributorId="org.eclipse.emf.eef.references.properties">
+            contributorId="org.eclipse.emf.eef.eefnr.properties">
          <propertySection
                class="org.eclipse.emf.eef.eefnr.references.parts.forms.ReferenceEnabledSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.references.providers.ReferenceEnabledSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.references.section.ReferenceEnabledSample"
                tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.references.ReferenceEnabledSample">
-             </input>
          </propertySection>
          <propertySection
                class="org.eclipse.emf.eef.eefnr.references.parts.forms.AbstractSamplePropertiesEditionPartForm"
+               filter="org.eclipse.emf.eef.references.providers.ReferenceEnabledSamplePropertiesEditionProvider$EditionFilter"
                id="org.eclipse.emf.eef.references.section.ReferenceEnabledSample"
                tab="AbstractSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.references.ReferenceEnabledSample">
-             </input>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.emf.eef.eefnr.references.parts.forms.AbstractSamplePropertiesEditionPartForm"
-               id="org.eclipse.emf.eef.eefnr.section.AbstractSample"
-               tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.AbstractSample">
-             </input>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.emf.eef.eefnr.references.parts.forms.AbstractEnabledSamplePropertiesEditionPartForm"
-               id="org.eclipse.emf.eef.references.section.AbstractEnabledSample"
-               tab="Base">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.references.AbstractEnabledSample">
-             </input>
-         </propertySection>
-         <propertySection
-               class="org.eclipse.emf.eef.eefnr.references.parts.forms.AbstractSamplePropertiesEditionPartForm"
-               id="org.eclipse.emf.eef.references.section.AbstractEnabledSample"
-               tab="AbstractSample">
-             <input
-                    type="org.eclipse.emf.eef.eefnr.references.AbstractEnabledSample">
-             </input>
          </propertySection>
       </propertySections>
    </extension>