Bug 396754 - Filter in element selection dialog doesn't work properly

remove addFilter in generation
add specific color label provider for elements already presents in the
tree viewer
regen nonreg and conference

9 files changed, 30 insertions, 229 deletions

diff --git a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableControl.mtl b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableControl.mtl
index 72e7c985d..46eb9b971 100644
--- a/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableControl.mtl
+++ b/plugins/org.eclipse.emf.eef.codegen/src/org/eclipse/emf/eef/codegen/widgets/impl/referencetable/referencetableControl.mtl
@@ -85,20 +85,6 @@ if (isAccessible([editionElement.views->first().editorID()/])) {
 
 [template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) overrides filterUpdater ? ((not editionElement.hasModelNavigation()) and editionElement.model.isReferenceMany() and editionElement.representationName('AdvancedReferencesTable'))]
 if (isAccessible([editionElement.views->first().editorID()/])) {
-	[view.viewIdentifier(pec)/].addFilterTo[editionElement.views->first().viewPackageSignature()/](new [include('org.eclipse.jface.viewers.ViewerFilter')/]() {
-	
-		/**
-		 * {@inheritDoc}
-		 * 
-		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public boolean select([include('org.eclipse.jface.viewers.Viewer')/] viewer, Object parentElement, Object element) {
-			if (element instanceof EObject)
-				return (![view.viewIdentifier(pec)/].isContainedIn[editionElement.views->first().viewPackageSignature()/]Table((EObject)element));
-			return element instanceof [include('org.eclipse.emf.ecore.resource.Resource')/];
-		}
-	
-	});
 	[view.viewIdentifier(pec)/].addFilterTo[editionElement.views->first().viewPackageSignature()/](new [include('org.eclipse.emf.eef.runtime.impl.filters.EObjectFilter')/]([editionElement.metamodelTypeGetter()/]));
 [for (filter : BindingFilter | editionElement.bindingFilters)]
 	[filter.filterBody(editionElement,view,pec)/]
@@ -150,20 +136,6 @@ if (isAccessible([editionElement.views->first().editorID()/])) {
 
 [template public filterUpdater(editionElement : PropertiesEditionElement, view : View, pec : PropertiesEditionComponent) overrides filterUpdater ? (editionElement.validCaseForMultipleModelReference())]
 if (isAccessible([editionElement.views->first().editorID()/])) {
-	[view.viewIdentifier(pec)/].addFilterTo[editionElement.views->first().viewPackageSignature()/](new [include('org.eclipse.jface.viewers.ViewerFilter')/]() {
-	
-		/**
-		 * {@inheritDoc}
-		 * 
-		 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public boolean select([include('org.eclipse.jface.viewers.Viewer')/] viewer, Object parentElement, Object element) {
-			if (element instanceof EObject)
-				return (![view.viewIdentifier(pec)/].isContainedIn[editionElement.views->first().viewPackageSignature()/]Table((EObject)element));
-			return [if (not editionElement.model.required)]element instanceof String && element.equals("")[else]false[/if];
-		}
-	
-	});
 	[view.viewIdentifier(pec)/].addFilterTo[editionElement.views->first().viewPackageSignature()/](new [include('org.eclipse.emf.eef.runtime.impl.filters.EObjectStrictFilter')/]([editionElement.metamodelTypeGetter()/]));
 [for (filter : BindingFilter | editionElement.bindingFilters)]
 	[filter.filterBody(editionElement,view,pec)/]
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/ui/widgets/TabElementTreeSelectionDialog.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/ui/widgets/TabElementTreeSelectionDialog.java
index f748c3f4e..7205a053d 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/ui/widgets/TabElementTreeSelectionDialog.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/ui/widgets/TabElementTreeSelectionDialog.java
@@ -19,10 +19,14 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedColorRegistry;
 import org.eclipse.emf.eef.runtime.impl.utils.ModelViewerHelper;
+import org.eclipse.emf.eef.runtime.ui.utils.EEFLabelProvider;
 import org.eclipse.emf.eef.runtime.ui.utils.EEFRuntimeUIMessages;
+import org.eclipse.emf.eef.runtime.ui.widgets.referencestable.ReferencesTableSettings;
 import org.eclipse.emf.eef.runtime.ui.widgets.settings.AdvancedEEFEditorContentProvider;
 import org.eclipse.emf.eef.runtime.ui.widgets.settings.EEFEditorSettings;
+import org.eclipse.jdt.internal.core.ResolvedSourceType;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
@@ -31,6 +35,7 @@ import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
@@ -38,6 +43,7 @@ import org.eclipse.jface.viewers.ViewerFilter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.custom.CTabItem;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -229,7 +235,19 @@ public abstract class TabElementTreeSelectionDialog extends Dialog implements IP
 		filters.add(patternFilter);
 		ViewerFilter[] v = filters.toArray(new ViewerFilter[filters.size()]);
 		treeViewer.setFilters(v);
-		treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+		treeViewer.setLabelProvider(new EEFLabelProvider() {
+			
+			@Override
+			public Color getForeground(Object element) {
+				if (input instanceof ReferencesTableSettings && element instanceof EObject && ((ReferencesTableSettings) input).contains((EObject) element)) {
+					return getShell().getDisplay()
+							.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
+				}
+				
+				return super.getForeground(element);
+			}
+
+		});
 
 		filteredTree.setLayoutData(new GridData(550, 300));
 		// handle selection change
@@ -245,9 +263,16 @@ public abstract class TabElementTreeSelectionDialog extends Dialog implements IP
 							Button okButton = getButton(IDialogConstants.OK_ID);
 							if (((List<?>)((EEFEditorSettings)input).choiceOfValues(adapterFactory))
 									.contains(o)) {
-								selection = structuredSelection;
-								if (okButton != null) {
-									okButton.setEnabled(true);
+								if (input instanceof ReferencesTableSettings && o instanceof EObject && !((ReferencesTableSettings) input).contains((EObject) o)) {
+									selection = structuredSelection;
+									if (okButton != null) {
+										okButton.setEnabled(true);
+									}
+								} else {
+									// Reject selection
+									if (okButton != null) {
+										okButton.setEnabled(false);
+									}
 								}
 							} else {
 								// Reject selection
@@ -266,7 +291,7 @@ public abstract class TabElementTreeSelectionDialog extends Dialog implements IP
 				public void doubleClick(DoubleClickEvent event) {
 					if (selection != null && !selection.isEmpty()) {
 						Object o = selection.getFirstElement();
-						if (((List<?>)((EEFEditorSettings)input).choiceOfValues(adapterFactory)).contains(o)) {
+						if (((List<?>)((EEFEditorSettings)input).choiceOfValues(adapterFactory)).contains(o) && input instanceof ReferencesTableSettings && o instanceof EObject && !((ReferencesTableSettings) input).contains((EObject) o)) {
 							okPressed();
 						}
 					}
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 0574b1d2d..c26245e28 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
@@ -120,58 +120,16 @@ public class AdvancedReferencesTableSamplePropertiesEditionComponent extends Sin
 			}
 			// init filters
 			if (isAccessible(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty)) {
-				basePart.addFilterToAdvancedreferencestableRequiredProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAdvancedreferencestableRequiredPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAdvancedreferencestableRequiredProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for advancedreferencestableRequiredProperty
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty)) {
-				basePart.addFilterToAdvancedreferencestableOptionalProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAdvancedreferencestableOptionalPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAdvancedreferencestableOptionalProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for advancedreferencestableOptionalProperty
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableROProperty)) {
-				basePart.addFilterToAdvancedreferencestableROProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAdvancedreferencestableROPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAdvancedreferencestableROProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for advancedreferencestableROProperty
 				// End of user code
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 8f6e8603c..776c64215 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
@@ -317,39 +317,11 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty)) {
-				basePart.addFilterToReferencestableRequiredProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInReferencestableRequiredPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToReferencestableRequiredProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for referencestableRequiredProperty
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty)) {
-				basePart.addFilterToReferencestableOptionalProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInReferencestableOptionalPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToReferencestableOptionalProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for referencestableOptionalProperty
 				// End of user code
@@ -389,39 +361,11 @@ public class TotalSamplePropertiesEditionComponent extends SinglePartPropertiesE
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty)) {
-				basePart.addFilterToAdvancedreferencestableRequiredProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAdvancedreferencestableRequiredPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAdvancedreferencestableRequiredProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for advancedreferencestableRequiredProperty
 				// End of user code
 			}
 			if (isAccessible(EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty)) {
-				basePart.addFilterToAdvancedreferencestableOptionalProperty(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAdvancedreferencestableOptionalPropertyTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAdvancedreferencestableOptionalProperty(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for advancedreferencestableOptionalProperty
 				// End of user code
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
index 82d62f28f..8df383bfb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/filters/components/ConcreteReferenceOwnerSamplePropertiesEditionComponent.java
@@ -133,20 +133,6 @@ public class ConcreteReferenceOwnerSamplePropertiesEditionComponent extends Sing
 			// init filters
 			
 			if (isAccessible(FiltersViewsRepository.ConcreteReferenceOwnerSample.Properties.abstractTarget)) {
-				basePart.addFilterToAbstractTarget(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInAbstractTargetTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToAbstractTarget(new EObjectFilter(FiltersPackage.Literals.ABSTRACT_REFERENCE_TARGET_SAMPLE));
 							basePart.addFilterToAbstractTarget(new ViewerFilter() {
 				
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
index f0f06af3f..6476e2227 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/OwnerPropertiesEditionComponent.java
@@ -383,39 +383,11 @@ public class OwnerPropertiesEditionComponent extends SinglePartPropertiesEditing
 				// End of user code
 			}
 			if (isAccessible(NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable)) {
-				basePart.addFilterToSingleSampleForReferencesTable(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInSingleSampleForReferencesTableTable((EObject)element));
-						return element instanceof String && element.equals("");
-					}
-				
-				});
 				basePart.addFilterToSingleSampleForReferencesTable(new EObjectStrictFilter(NavigationPackage.Literals.OWNER));
 				// Start of user code for additional businessfilters for singleSampleForReferencesTable
 				// End of user code
 			}
 			if (isAccessible(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable)) {
-				basePart.addFilterToSingleSampleForAdvancedReferencesTable(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInSingleSampleForAdvancedReferencesTableTable((EObject)element));
-						return element instanceof String && element.equals("");
-					}
-				
-				});
 				basePart.addFilterToSingleSampleForAdvancedReferencesTable(new EObjectStrictFilter(NavigationPackage.Literals.OWNER));
 				// Start of user code for additional businessfilters for singleSampleForAdvancedReferencesTable
 				// End of user code
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
index 42bece279..b0efb1977 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.edit/src-gen/org/eclipse/emf/eef/navigation/components/SubtypeBasePropertiesEditionComponent.java
@@ -225,39 +225,11 @@ public class SubtypeBasePropertiesEditionComponent extends SinglePartPropertiesE
 				// End of user code
 			}
 			if (isAccessible(NavigationViewsRepository.Owner.Properties.singleSampleForReferencesTable)) {
-				basePart.addFilterToSingleSampleForReferencesTable(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInSingleSampleForReferencesTableTable((EObject)element));
-						return element instanceof String && element.equals("");
-					}
-				
-				});
 				basePart.addFilterToSingleSampleForReferencesTable(new EObjectStrictFilter(NavigationPackage.Literals.OWNER));
 				// Start of user code for additional businessfilters for singleSampleForReferencesTable
 				// End of user code
 			}
 			if (isAccessible(NavigationViewsRepository.Owner.Properties.singleSampleForAdvancedReferencesTable)) {
-				basePart.addFilterToSingleSampleForAdvancedReferencesTable(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInSingleSampleForAdvancedReferencesTableTable((EObject)element));
-						return element instanceof String && element.equals("");
-					}
-				
-				});
 				basePart.addFilterToSingleSampleForAdvancedReferencesTable(new EObjectStrictFilter(NavigationPackage.Literals.OWNER));
 				// Start of user code for additional businessfilters for singleSampleForAdvancedReferencesTable
 				// End of user code
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 bbc62dcad..6b7dbdc80 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
@@ -104,20 +104,6 @@ public class ReferenceEnabledSampleBasePropertiesEditionComponent extends Single
 			}
 			// init filters
 			if (isAccessible(ReferencesViewsRepository.ReferenceEnabledSample.Properties.reference)) {
-				basePart.addFilterToReference(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!basePart.isContainedInReferenceTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				basePart.addFilterToReference(new EObjectFilter(EefnrPackage.Literals.TOTAL_SAMPLE));
 				// Start of user code for additional businessfilters for reference
 				// End of user code
diff --git a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java
index 613265474..bb4036820 100644
--- a/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java
+++ b/tests/org.eclipse.emf.examples.eef.edit/src-gen/org/eclipse/emf/samples/conference/components/PersonPresencePropertiesEditionComponent.java
@@ -102,20 +102,6 @@ public class PersonPresencePropertiesEditionComponent extends SinglePartProperti
 			}
 			// init filters
 			if (isAccessible(ConferenceViewsRepository.Presence.Talks.assists)) {
-				presencePart.addFilterToAssists(new ViewerFilter() {
-				
-					/**
-					 * {@inheritDoc}
-					 * 
-					 * @see org.eclipse.jface.viewers.ViewerFilter#select(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-					 */
-					public boolean select(Viewer viewer, Object parentElement, Object element) {
-						if (element instanceof EObject)
-							return (!presencePart.isContainedInAssistsTable((EObject)element));
-						return element instanceof Resource;
-					}
-				
-				});
 				presencePart.addFilterToAssists(new EObjectFilter(ConferencePackage.Literals.TALK));
 				// Start of user code for additional businessfilters for assists
 				// End of user code