bug 293130 - Polishing the Filter extension point

18 files changed, 76 insertions, 95 deletions

diff --git a/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
index add4ed642..af835e2ab 100644
--- a/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
@@ -18,6 +18,7 @@ Export-Package: org.eclipse.core.internal.dtree;x-internal:=true,
  org.eclipse.core.internal.utils;x-internal:=true,
  org.eclipse.core.internal.watson;x-internal:=true,
  org.eclipse.core.resources,
+ org.eclipse.core.resources.filtermatchers,
  org.eclipse.core.resources.mapping,
  org.eclipse.core.resources.refresh,
  org.eclipse.core.resources.team
diff --git a/bundles/org.eclipse.core.resources/plugin.properties b/bundles/org.eclipse.core.resources/plugin.properties
index 0bad77d84..2be3d19af 100644
--- a/bundles/org.eclipse.core.resources/plugin.properties
+++ b/bundles/org.eclipse.core.resources/plugin.properties
@@ -19,7 +19,7 @@ teamHookName = Team Hook
 preferencesContentTypeName = Preferences
 refreshProvidersName=Refresh Providers
 modelProviders=Model Providers
-filters=Filters
+filterMatchers=Filter Matchers
 preferencesExtPtName=Resource Preferences
 resourceModelName=File System Resources
 
diff --git a/bundles/org.eclipse.core.resources/plugin.xml b/bundles/org.eclipse.core.resources/plugin.xml
index 88907d29d..eff2851b3 100644
--- a/bundles/org.eclipse.core.resources/plugin.xml
+++ b/bundles/org.eclipse.core.resources/plugin.xml
@@ -10,7 +10,7 @@
    <extension-point id="teamHook" name="%teamHookName" schema="schema/teamHook.exsd"/>
    <extension-point id="refreshProviders" name="%refreshProvidersName" schema="schema/refreshProviders.exsd"/>
    <extension-point id="modelProviders" name="%modelProviders" schema="schema/modelProviders.exsd"/>
-   <extension-point id="filters" name="%filters" schema="schema/filters.exsd"/>
+   <extension-point id="filterMatchers" name="%filterMatchers" schema="schema/filterMatchers.exsd"/>
 
 	<extension id="preferences" point="org.eclipse.core.runtime.preferences" name="%preferencesExtPtName">
 		<scope name="project" class="org.eclipse.core.internal.resources.ProjectPreferences"/>
@@ -189,17 +189,17 @@
             properties="projectPersistentProperty"
             id="org.eclipse.core.resources.mappingPropertyTester"/>
    </extension>
-<!-- Filters -->
+<!-- Filter Matchers-->
    <extension
-         point="org.eclipse.core.resources.filters">
-      <filter
-      		id="org.eclipse.core.resources.filters.regexFilter"
+         point="org.eclipse.core.resources.filterMatchers">
+      <filterMatcher
+      		id="org.eclipse.core.resources.regexFilterMatcher"
             argumentType="string"
             class="org.eclipse.core.internal.resources.RegexFileInfoMatcher"
             description="%regexFilterProvider.description"
             name="%regexFilterProvider.name"
             ordering="first">
-      </filter>
+      </filterMatcher>
    </extension>
 
    <extension
diff --git a/bundles/org.eclipse.core.resources/schema/filters.exsd b/bundles/org.eclipse.core.resources/schema/filterMatchers.exsd
index f9b5fdac7..1525f05b9 100644
--- a/bundles/org.eclipse.core.resources/schema/filters.exsd
+++ b/bundles/org.eclipse.core.resources/schema/filterMatchers.exsd
@@ -3,10 +3,10 @@
 <schema targetNamespace="org.eclipse.core.resources" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
       <appInfo>
-         <meta.schema plugin="org.eclipse.core.resources" id="filters" name="Filters"/>
+         <meta.schema plugin="org.eclipse.core.resources" id="filterMatchers" name="Filter Matchers"/>
       </appInfo>
       <documentation>
-         A filter extension allows defining resource filter types that can be applied on a folder to remove file system objects from populating the resource tree.
+         The filter matchers extension point allows plug-ins to contribute matchers. The matchers are used by filters applied on containers (folders or projects) to include or exclude some file system objects while populating the resources tree.
       </documentation>
    </annotation>
 
@@ -18,7 +18,7 @@
       </annotation>
       <complexType>
          <sequence>
-            <element ref="filter" minOccurs="1" maxOccurs="unbounded"/>
+            <element ref="filterMatcher" minOccurs="1" maxOccurs="unbounded"/>
          </sequence>
          <attribute name="point" type="string" use="required">
             <annotation>
@@ -47,7 +47,7 @@
       </complexType>
    </element>
 
-   <element name="filter">
+   <element name="filterMatcher">
       <complexType>
          <attribute name="class" type="string" use="required">
             <annotation>
@@ -71,9 +71,9 @@
                   </enumeration>
                   <enumeration value="string">
                   </enumeration>
-                  <enumeration value="filter">
+                  <enumeration value="filterMatcher">
                   </enumeration>
-                  <enumeration value="filters">
+                  <enumeration value="filterMatchers">
                   </enumeration>
                </restriction>
             </simpleType>
@@ -141,13 +141,11 @@
 (in file plugin.xml)
 &lt;pre&gt;
    &lt;extension
-         point=&quot;org.eclipse.core.resources.filters&quot;
-         id=&quot;regexFilter&quot;&gt;
-      &lt;filter
+         point=&quot;org.eclipse.core.resources.filterMatchers&quot;&gt;
+      &lt;filterMatcher
             argumentType=&quot;string&quot;
-            class=&quot;org.eclipse.core.internal.resources.RegexFilterProvider&quot;
-            hasArguments=&quot;true&quot;&gt;
-      &lt;/filter&gt;
+            class=&quot;org.eclipse.core.internal.resources.RegexFileInfoMatcher&quot;&gt;
+      &lt;/filterMatcher&gt;
    &lt;/extension&gt;
 &lt;/pre&gt;
       </documentation>
@@ -158,7 +156,8 @@
          <meta.section type="apiInfo"/>
       </appInfo>
       <documentation>
-         The value of the class attribute must represent an implementation of &lt;tt&gt;org.eclipse.core.resources.IFileInfoFilterFactory&lt;/tt&gt;.
+         The value of the class attribute must represent a 
+subclass of &lt;samp&gt;org.eclipse.core.resources.AbstractFileInfoMatcher&lt;/samp&gt;.
       </documentation>
    </annotation>
 
@@ -167,7 +166,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-         The core resource plugin provides the regex filter, allowing the user to specify string arguments matching the specification supported by java.util.regex.Pattern.
+         The core resource plugin provides the regex matcher, allowing the user to specify string arguments matching the specification supported by java.util.regex.Pattern.
       </documentation>
    </annotation>
 
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Filter.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Filter.java
index 58102e918..17894a7a4 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Filter.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Filter.java
@@ -16,6 +16,7 @@ import java.util.LinkedList;
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.internal.utils.Messages;
 import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
 import org.eclipse.core.runtime.*;
 import org.eclipse.osgi.util.NLS;
 
@@ -35,7 +36,7 @@ public class Filter {
 
 	public boolean match(IFileInfo fileInfo) throws CoreException {
 		if (provider == null) {
-			IFilterDescriptor filterDescriptor = project.getWorkspace().getFilterDescriptor(getId());
+			IFilterMatcherDescriptor filterDescriptor = project.getWorkspace().getFilterMatcherDescriptor(getId());
 			if (filterDescriptor != null)
 				provider = ((FilterDescriptor) filterDescriptor).createFilter();
 			provider.initialize(project, description.getFileInfoMatcherDescription().getArguments());
@@ -50,7 +51,7 @@ public class Filter {
 	}
 
 	public boolean isFirst() {
-		IFilterDescriptor descriptor = project.getWorkspace().getFilterDescriptor(getId());
+		IFilterMatcherDescriptor descriptor = project.getWorkspace().getFilterMatcherDescriptor(getId());
 		if (descriptor != null)
 			return descriptor.isFirstOrdering();
 		return false;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterDescriptor.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterDescriptor.java
index 351157ab2..6a43c64fd 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterDescriptor.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterDescriptor.java
@@ -10,12 +10,12 @@
  *******************************************************************************/
 package org.eclipse.core.internal.resources;
 
-import org.eclipse.core.resources.AbstractFileInfoMatcher;
-import org.eclipse.core.resources.IFilterDescriptor;
+import org.eclipse.core.resources.IFilterMatcherDescriptor;
+import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 
-public class FilterDescriptor implements IFilterDescriptor {
+public class FilterDescriptor implements IFilterMatcherDescriptor {
 	private String id;
 	private String name;
 	private String description;
@@ -33,7 +33,7 @@ public class FilterDescriptor implements IFilterDescriptor {
 		description = element.getAttribute("description"); //$NON-NLS-1$
 		argumentType = element.getAttribute("argumentType"); //$NON-NLS-1$
 		if (argumentType == null)
-			argumentType = IFilterDescriptor.ARGUMENT_TYPE_NONE;
+			argumentType = IFilterMatcherDescriptor.ARGUMENT_TYPE_NONE;
 		this.element = element;
 		String ordering = element.getAttribute("ordering"); //$NON-NLS-1$
 		if (ordering != null)
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterTypeManager.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterTypeManager.java
index 35268deae..5b8c936ad 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterTypeManager.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/FilterTypeManager.java
@@ -12,7 +12,9 @@
 package org.eclipse.core.internal.resources;
 
 import java.util.HashMap;
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IFilterMatcherDescriptor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
 import org.eclipse.core.runtime.*;
 
 /**
@@ -21,12 +23,12 @@ import org.eclipse.core.runtime.*;
  */
 class FilterTypeManager implements IManager {
 
-	private static final String FILTER_ELEMENT = "filter"; //$NON-NLS-1$
+	private static final String FILTER_ELEMENT = "filterMatcher"; //$NON-NLS-1$
 
 	private HashMap/*<String, FilterDescriptor>*/factories = new HashMap();
 
 	public FilterTypeManager() {
-		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_FILTERS);
+		IExtensionPoint point = RegistryFactory.getRegistry().getExtensionPoint(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PT_FILTER_MATCHERS);
 		if (point != null) {
 			IExtension[] ext = point.getExtensions();
 			// initial population
@@ -56,12 +58,12 @@ class FilterTypeManager implements IManager {
 		}
 	}
 
-	public IFilterDescriptor getFilterDescriptor(String id) {
-		return (IFilterDescriptor) factories.get(id);
+	public IFilterMatcherDescriptor getFilterDescriptor(String id) {
+		return (IFilterMatcherDescriptor) factories.get(id);
 	}
 
-	public IFilterDescriptor[] getFilterDescriptors() {
-		return (IFilterDescriptor[]) factories.values().toArray(new IFilterDescriptor[0]);
+	public IFilterMatcherDescriptor[] getFilterDescriptors() {
+		return (IFilterMatcherDescriptor[]) factories.values().toArray(new IFilterMatcherDescriptor[0]);
 	}
 
 	protected void processExtension(IExtension extension) {
@@ -70,7 +72,7 @@ class FilterTypeManager implements IManager {
 			IConfigurationElement element = elements[i];
 			if (element.getName().equalsIgnoreCase(FILTER_ELEMENT)) {
 				try {
-					IFilterDescriptor desc = new FilterDescriptor(element);
+					IFilterMatcherDescriptor desc = new FilterDescriptor(element);
 					factories.put(desc.getId(), desc);
 				} catch (CoreException e) {
 					e.printStackTrace();
@@ -85,7 +87,7 @@ class FilterTypeManager implements IManager {
 			IConfigurationElement element = elements[i];
 			if (element.getName().equalsIgnoreCase(FILTER_ELEMENT)) {
 				try {
-					IFilterDescriptor desc = new FilterDescriptor(element, false);
+					IFilterMatcherDescriptor desc = new FilterDescriptor(element, false);
 					factories.remove(desc.getId());
 				} catch (CoreException e) {
 					e.printStackTrace();
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/RegexFileInfoMatcher.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/RegexFileInfoMatcher.java
index ad18e5275..b8f44871c 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/RegexFileInfoMatcher.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/RegexFileInfoMatcher.java
@@ -14,8 +14,8 @@ package org.eclipse.core.internal.resources;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.resources.AbstractFileInfoMatcher;
 import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
 
 /**
  * A Filter provider for Java Regular expression supported by 
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
index 171ce8078..56292a839 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Workspace.java
@@ -1219,11 +1219,11 @@ public class Workspace extends PlatformObject implements IWorkspace, ICoreConsta
 		return moveDeleteHook;
 	}
 
-	public IFilterDescriptor getFilterDescriptor(String filterId) {
-		return filterManager.getFilterDescriptor(filterId);
+	public IFilterMatcherDescriptor getFilterMatcherDescriptor(String filterMAtcherId) {
+		return filterManager.getFilterDescriptor(filterMAtcherId);
 	}
 
-	public IFilterDescriptor[] getFilterDescriptors() {
+	public IFilterMatcherDescriptor[] getFilterMatcherDescriptors() {
 		return filterManager.getFilterDescriptors();
 	}
 
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterDescriptor.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java
index 6b07dbdb0..0328cf4e6 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterDescriptor.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IFilterMatcherDescriptor.java
@@ -11,6 +11,8 @@
  *******************************************************************************/
 package org.eclipse.core.resources;
 
+import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
+
 /**
  * A filter descriptor contains information about a filter type
  * obtained from the plug-in manifest (<code>plugin.xml</code>) files.
@@ -20,24 +22,24 @@ package org.eclipse.core.resources;
  * </p>
  * 
  * @see AbstractFileInfoMatcher
- * @see IWorkspace#getFilterDescriptor(String)
- * @see IWorkspace#getFilterDescriptors()
+ * @see IWorkspace#getFilterMatcherDescriptor(String)
+ * @see IWorkspace#getFilterMatcherDescriptors()
  * @since 3.6
  * @noimplement This interface is not intended to be implemented by clients.
  * @noextend This interface is not intended to be extended by clients.
  */
-public interface IFilterDescriptor {
+public interface IFilterMatcherDescriptor {
 
 	/**
 	 * An argument filter type constant (value "filter"), denoting that this
 	 * filter takes another filter as argument.
 	 */
-	public static final String ARGUMENT_TYPE_FILTER = "filter"; //$NON-NLS-1$
+	public static final String ARGUMENT_TYPE_FILTER_MATCHER = "filterMatcher"; //$NON-NLS-1$
 	/**
 	 * An argument filter type constant (value "filters"), denoting that this
 	 * filter takes an array of other filters as argument.
 	 */
-	public static final String ARGUMENT_TYPE_FILTERS = "filters"; //$NON-NLS-1$
+	public static final String ARGUMENT_TYPE_FILTER_MATCHERS = "filterMatchers"; //$NON-NLS-1$
 	/**
 	 * An argument filter type constant (value "none"), denoting that this
 	 * filter does not take any arguments.
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
index d1b9a862f..56a6d2f7f 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/IWorkspace.java
@@ -626,24 +626,24 @@ public interface IWorkspace extends IAdaptable {
 	public void forgetSavedTree(String pluginId);
 
 	/**
-	 * Returns all filter descriptors known to this workspace. Returns an empty
-	 * array if there are no installed filters.
+	 * Returns all filter matcher descriptors known to this workspace. Returns an empty
+	 * array if there are no installed filter matchers.
 	 * 
-	 * @return the filter descriptors known to this workspace
+	 * @return the filter matcher descriptors known to this workspace
 	 * @since 3.6
 	 */
-	public IFilterDescriptor[] getFilterDescriptors();
+	public IFilterMatcherDescriptor[] getFilterMatcherDescriptors();
 
 	/**
 	 * Returns the filter descriptor with the given unique identifier, or
 	 * <code>null</code> if there is no such filter.
 	 * 
-	 * @param filterId the filter extension identifier (e.g.
+	 * @param filterMatcherId the filter matcher extension identifier (e.g.
 	 * <code>"com.example.coolFilter"</code>).
-	 * @return the filter descriptor, or <code>null</code>
+	 * @return the filter matcher descriptor, or <code>null</code>
 	 * @since 3.6
 	 */
-	public IFilterDescriptor getFilterDescriptor(String filterId);
+	public IFilterMatcherDescriptor getFilterMatcherDescriptor(String filterMatcherId);
 
 	/**
 	 * Returns all nature descriptors known to this workspace. Returns an empty
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
index 021a3e665..63dbfc4e0 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourcesPlugin.java
@@ -12,8 +12,6 @@
  *******************************************************************************/
 package org.eclipse.core.resources;
 
-import org.osgi.framework.ServiceRegistration;
-
 import org.eclipse.core.internal.resources.*;
 import org.eclipse.core.internal.utils.Messages;
 import org.eclipse.core.runtime.*;
@@ -107,12 +105,12 @@ public final class ResourcesPlugin extends Plugin {
 	public static final String PT_VARIABLE_PROVIDERS = "variableResolvers"; //$NON-NLS-1$
 
 	/**
-	 * Simple identifier constant (value <code>"filters"</code>)
-	 * for the filters extension point.
+	 * Simple identifier constant (value <code>"filterMatchers"</code>)
+	 * for the filter matchers extension point.
 	 * 
 	 * @since 3.6
 	 */
-	public static final String PT_FILTERS = "filters"; //$NON-NLS-1$
+	public static final String PT_FILTER_MATCHERS = "filterMatchers"; //$NON-NLS-1$
 
 	/**
 	 * Constant identifying the job family identifier for the background autobuild job.
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/AbstractFileInfoMatcher.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/AbstractFileInfoMatcher.java
index a6cd39d23..d26f00342 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/AbstractFileInfoMatcher.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/AbstractFileInfoMatcher.java
@@ -9,7 +9,9 @@
  *     Serge Beauchamp(Freescale Semiconductor) - initial API and implementation
  *     IBM Corporation - ongoing development
  *******************************************************************************/
-package org.eclipse.core.resources;
+package org.eclipse.core.resources.filtermatchers;
+
+import org.eclipse.core.resources.IProject;
 
 import org.eclipse.core.filesystem.IFileInfo;
 import org.eclipse.core.filesystem.IFileInfoFilter;
diff --git a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/CompoundFileInfoMatcher.java b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/CompoundFileInfoMatcher.java
index 0887edc6b..91828ba4b 100644
--- a/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/CompoundFileInfoMatcher.java
+++ b/bundles/org.eclipse.core.resources/src/org/eclipse/core/resources/filtermatchers/CompoundFileInfoMatcher.java
@@ -9,7 +9,9 @@
  *     Serge Beauchamp (Freescale Semiconductor) - [252996] initial API and implementation
  *     IBM Corporation - ongoing implementation
  *******************************************************************************/
-package org.eclipse.core.resources;
+package org.eclipse.core.resources.filtermatchers;
+
+import org.eclipse.core.resources.*;
 
 import org.eclipse.core.internal.resources.FilterDescriptor;
 
@@ -23,7 +25,7 @@ public abstract class CompoundFileInfoMatcher extends AbstractFileInfoMatcher {
 
 	protected AbstractFileInfoMatcher instantiate(IProject project,
 			IFileInfoMatcherDescription filter) {
-		IFilterDescriptor desc = project.getWorkspace().getFilterDescriptor(
+		IFilterMatcherDescriptor desc = project.getWorkspace().getFilterMatcherDescriptor(
 				filter.getId());
 		if (desc != null) {
 			AbstractFileInfoMatcher matcher = ((FilterDescriptor) desc)
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllTests.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllTests.java
index 6045def19..95796dc4e 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllTests.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AllTests.java
@@ -26,6 +26,7 @@ public class AllTests extends TestCase {
 		TestSuite suite = new TestSuite(AllTests.class.getName());
 		suite.addTest(CharsetTest.suite());
 		suite.addTest(ContentDescriptionManagerTest.suite());
+		suite.addTest(FilteredResourceTest.suite());
 		suite.addTest(HiddenResourceTest.suite());
 		suite.addTest(IFileTest.suite());
 		suite.addTest(IFolderTest.suite());
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java
index bb9c35f7e..14f6b3224 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java
@@ -29,7 +29,7 @@ import org.eclipse.core.runtime.IPath;
  * and moving those resources to different parents.
  */
 public class FilteredResourceTest extends ResourceTest {
-	private static final String REGEX_FILTER_PROVIDER = "org.eclipse.core.resources.filters.regexFilter";
+	private static final String REGEX_FILTER_PROVIDER = "org.eclipse.core.resources.regexFilterMatcher";
 	protected String childName = "File.txt";
 	protected IProject closedProject;
 	protected IFile existingFileInExistingProject;
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFilterDescriptorTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFilterDescriptorTest.java
deleted file mode 100644
index 9f41e7d50..000000000
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFilterDescriptorTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.tests.resources;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.IFilterDescriptor;
-
-/**
- * Tests for {@link org.eclipse.core.resources.IFileInfoFilterFactory}.
- */
-public class IFilterDescriptorTest extends ResourceTest {
-	public static Test suite() {
-		return new TestSuite(IFilterDescriptorTest.class);
-	}
-
-	public void testGetFilter() {
-		IFilterDescriptor descriptor = getWorkspace().getFilterDescriptor("");
-		assertNull("1.0", descriptor);
-		descriptor = getWorkspace().getFilterDescriptor("org.eclipse.core.resources.regexFilter");
-		assertNotNull("1.1", descriptor);
-	}
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java
index 128f0800c..7caa48b8b 100644
--- a/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java
+++ b/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.core.tests.resources;
 
-import org.eclipse.core.resources.IWorkspace;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import junit.framework.Test;
@@ -1202,6 +1200,12 @@ public class IWorkspaceTest extends ResourceTest {
 		assertNotNull("1.0", ref);
 		IWorkspace ws = (IWorkspace) context.getService(ref);
 		assertNotNull("1.1", ws);
-		
+	}
+
+	public void testGetFilterMatcherDescriptor() {
+		IFilterMatcherDescriptor descriptor = getWorkspace().getFilterMatcherDescriptor("");
+		assertNull("1.0", descriptor);
+		descriptor = getWorkspace().getFilterMatcherDescriptor("org.eclipse.core.resources.regexFilterMatcher");
+		assertNotNull("1.1", descriptor);
 	}
 }