Attachment #149866 for bug #291755

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 64-70 Link Here

(-)src/org/eclipse/core/internal/resources/Filter.java (-1 / +1 lines)
64	return false;	64	return false;
65	}	65	}
66		66
67	public String getArguments() {	67	public Object getArguments() {
68	return description.getArguments();	68	return description.getArguments();
69	}	69	}
70		70




 *******************************************************************************/
package org.eclipse.core.internal.resources;

import org.eclipse.core.resources.IProject;

import java.util.LinkedList;
import org.eclipse.core.runtime.IPath;

import java.util.Iterator;
import java.util.LinkedList;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceFilter;
import org.eclipse.core.runtime.*;

/**
 * Class for describing the characteristics of filters that are stored
 * in the project description.
 */
public class FilterDescription implements Comparable, IResourceFilter {

	private String id;
	private Object arguments;

	/**
	 * The project relative path.

		this.arguments = null;
	}

	public FilterDescription(IResource resource, int type, String filterID, Object arguments) {
		super();
		Assert.isNotNull(resource);
		Assert.isNotNull(filterID);

		this.arguments = arguments;
	}

	private FilterDescription(IPath projectRelativePath, int type, String filterID, Object arguments) {
		super();
		Assert.isNotNull(projectRelativePath);
		Assert.isNotNull(filterID);

		return id;
	}

	public Object getArguments() {
		return arguments;
	}


		this.id = id;
	}

	public void setArguments(Object arguments) {
		this.arguments = arguments;
	}


		}
		return copy;
	}

	public String getId() {
		return id;
	}

	public IPath getPath() {
		return path;
	}

	public IProject getProject() {
		return null;
	}
}




import org.eclipse.core.internal.events.BuildCommand;
import org.eclipse.core.internal.localstore.SafeFileOutputStream;
import org.eclipse.core.internal.utils.FileUtil;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.IPath;

//

		writer.endTag(LINK);
	}

	protected void write(IResourceFilter description, XMLWriter writer) {
		writer.startTag(FILTER, null);
		if (description != null) {
			writer.printSimpleTag(NAME, description.getPath());
			writer.printSimpleTag(TYPE, Integer.toString(description.getType()));
			writer.printSimpleTag(ID, description.getId());
			if (description.getArguments() != null){
				if (description.getArguments() instanceof String){
					writer.printSimpleTag(ARGUMENTS, description.getArguments());
				}
				else if (description.getArguments() instanceof IResourceFilter[]){
						writer.startTag(ARGUMENTS, null);
						IResourceFilter[] array = (IResourceFilter[])description.getArguments();
						for (int i=0; i< array.length; i ++){
							write(array[i], writer);
						}	
						writer.endTag(ARGUMENTS);
				}
				else writer.printSimpleTag(ARGUMENTS, ""); //$NON-NLS-1$
					
			}
				
		}
		writer.endTag(FILTER);
	}

			write((LinkDescription) obj, writer);
			return;
		}
		if (obj instanceof IResourceFilter) {
			write((IResourceFilter) obj, writer);
			return;
		}
		if (obj instanceof VariableDescription) {




	 */
	private void endFilterElement(String elementName) {
		if (elementName.equals(FILTER)) {
			state = S_FILTERED_RESOURCES;
			// Pop off the filter description
			FilterDescription filter = (FilterDescription) objectStack.pop();
			// Make sure that you have something reasonable

				return;
			}

			if (objectStack.peek() instanceof HashMap) {
				state = S_FILTERED_RESOURCES;
				// The HashMap of filtered resources is the next thing on the stack
				HashMap map = ((HashMap) objectStack.peek());
				LinkedList/*FilterDescription*/list = (LinkedList/*FilterDescription*/) map.get(filter.getProjectRelativePath());
				if (list == null) {
					list = new LinkedList/*FilterDescription*/();
					map.put(filter.getProjectRelativePath(), list);
				}
				list.add(filter);
			}
			
			if (objectStack.peek() instanceof ArrayList) {
				state = S_FILTER_ARGUMENTS;
				ArrayList l = ((ArrayList) objectStack.peek());
				l.add(filter);
			}
			list.add(filter);
		}
	}



	private void endFilterArguments(String elementName) {
		if (elementName.equals(ARGUMENTS)) {
			ArrayList filters = (ArrayList) objectStack.pop();
			Object newArguments = charBuffer.toString();
			
			if (filters.size() > 0)
				newArguments = filters.toArray(new IResourceFilter[filters.size()]);
			
			Object oldArguments = ((FilterDescription) objectStack.peek()).getArguments();
			if (oldArguments != null) {
				parseProblem(NLS.bind(Messages.projRead_badArguments, oldArguments, newArguments));
			} else

			case S_FILTERED_RESOURCES :
				if (elementName.equals(FILTER)) {
					state = S_FILTER;
					// Push place holders for the name, type, id and arguments of
					// this filter.
					objectStack.push(new FilterDescription());
				}

					state = S_FILTER_ID;
				} else if (elementName.equals(ARGUMENTS)) {
					state = S_FILTER_ARGUMENTS;
					objectStack.push(new ArrayList());
				}
				break;
			case S_FILTER_ARGUMENTS:
				if (elementName.equals(FILTER)) {
					state = S_FILTER;
					// Push place holders for the name, type, id and arguments of
					// this filter.
					objectStack.push(new FilterDescription());
				}
				break;
			case S_VARIABLE:

Lines 38-44 Link Here

(-)src/org/eclipse/core/internal/resources/RegexFilterFactory.java (-2 / +2 lines)
38	}	38	}
39	}	39	}
40		40
41	public IFileInfoFilter instantiate(IProject project, String arguments) {	41	public IFileInfoFilter instantiate(IProject project, Object arguments) {
42	return new RegexFilterType(project, arguments);	42	return new RegexFilterType(project, (String)arguments);
43	}	43	}
44	}	44	}






	/* (non-Javadoc)
	 * @see org.eclipse.core.resources.IContainer#addFilter(String, int, Object, IProgressMonitor)
	 */
	public void addFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {
		Assert.isNotNull(filterID);
		Assert.isNotNull(getProject());
		monitor = Policy.monitorFor(monitor);

	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.resources.IFolder#removeFilter(String, int, Object, IProgressMonitor)
	 */
	public void removeFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {
		Assert.isNotNull(filterID);
		monitor = Policy.monitorFor(monitor);
		try {




	 * @exception OperationCanceledException if the operation is canceled. 
	 * Cancelation can occur even if no progress monitor is provided.
	 *
	 * @see IContainer#removeFilter(String, int, Object, int, IProgressMonitor)
	 * @see IContainer#getFilters()
	 * 
	 * @since 3.6
	 */
	public void addFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;

	/**
	 * Remove the filter matching the arguments from this folder's filter list  

	 * @exception OperationCanceledException if the operation is canceled. 
	 * Cancelation can occur even if no progress monitor is provided.
	 *
	 * @see IContainer#addFilter(String, int, Object, int, IProgressMonitor)
	 * @see IContainer#getFilters()
	 * 
	 * @since 3.6
	 */
	public void removeFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;

	/**
	 * Retrieve the filters for this folder.

	 * <ul>
	 * <li> This resource is not a folder.</li>
	 *
	 * @see IContainer#addFilter(String, int, Object, int, IProgressMonitor)
	 * @see IContainer#removeFilter(String, int, Object, int, IProgressMonitor)
	 * 
	 * @since 3.6
	 */

Lines 28-32 Link Here

(-)src/org/eclipse/core/resources/IFileInfoFilterFactory.java (-1 / +1 lines)
28	* @param arguments the test arguments, or <code>null</code> if not applicable	28	* @param arguments the test arguments, or <code>null</code> if not applicable
29	* for this filter type.	29	* for this filter type.
30	*/	30	*/
31	public IFileInfoFilter instantiate(IProject project, String arguments);	31	public IFileInfoFilter instantiate(IProject project, Object arguments);
32	}	32	}

Lines 1716-1723 Link Here

(-)src/org/eclipse/core/resources/IResource.java (-2 / +2 lines)
1716	*	1716	*
1717	* @return <code>true</code> if this resource has filters, and	1717	* @return <code>true</code> if this resource has filters, and
1718	* <code>false</code> otherwise	1718	* <code>false</code> otherwise
1719	* @see IContainer#addFilter(String, int, String, int, IProgressMonitor)	1719	* @see IContainer#addFilter(String, int, Object, int, IProgressMonitor)
1720	* @see IContainer#removeFilter(String, int, String, int, IProgressMonitor)	1720	* @see IContainer#removeFilter(String, int, Object, int, IProgressMonitor)
1721	* @since 3.6	1721	* @since 3.6
1722	*/	1722	*/
1723	public boolean hasFilters();	1723	public boolean hasFilters();

Lines 17-24 Link Here

(-)src/org/eclipse/core/resources/IResourceFilter.java (-3 / +3 lines)
17	* Interface for resource filters. A filter determines which file system	17	* Interface for resource filters. A filter determines which file system
18	* objects will be visible when a local refresh is performed for an IContainer.	18	* objects will be visible when a local refresh is performed for an IContainer.
19	*	19	*
20	* @see IFolder#addFilter(String, int, String, int, IProgressMonitor)	20	* @see IFolder#addFilter(String, int, Object, int, IProgressMonitor)
21	* @see IFolder#removeFilter(String, int, String, int, IProgressMonitor)	21	* @see IFolder#removeFilter(String, int, Object, int, IProgressMonitor)
22	* @see IFolder#getFilters()	22	* @see IFolder#getFilters()
23	* @noimplement This interface is not intended to be implemented by clients.	23	* @noimplement This interface is not intended to be implemented by clients.
24	* @since 3.6	24	* @since 3.6
Lines 88-94 Link Here
88	*	88	*
89	* @return the argument string, or null	89	* @return the argument string, or null
90	*/	90	*/
91	public String getArguments();	91	public Object getArguments();
92		92
93	/**	93	/**
94	* Returns the project which contains this filter.	94	* Returns the project which contains this filter.




import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
import org.eclipse.ui.internal.ide.misc.CompoundResourceFilter;
import org.eclipse.ui.plugin.AbstractUIPlugin;

/**

			}
			if (column.equals(FilterTypeUtil.ARGUMENTS)) {
				if (filter.hasStringArguments())
					return filter.getArguments().toString();
				if ((filter.getChildrenLimit() > 0)
						&& !filter.isUnderAGroupFilter())
					return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$


class FilterCopy implements IResourceFilter {
	static String EMPTY = ""; //$NON-NLS-1$
	Object arguments = EMPTY;
	String id = null;
	IPath path = null;
	IProject project = null;

		id = FilterTypeUtil.getDefaultFilterID();
	}

	public Object getArguments() {
		return arguments;
	}


		if (children == null) {
			if (getChildrenLimit() > 0) {
				children = new LinkedList();
				IResourceFilter[] filters = (IResourceFilter[])getArguments(); //CompoundResourceFilter.unserialize(getProject(), getArguments());
						getProject(), getArguments());
				for (int i = 0; i < filters.length; i++) {
					FilterCopy child = new FilterCopy(filters[i]);
					child.parent = this;

	protected void argumentsChanged() {
		initializeChildren();
		if (children != null)
			arguments = (FilterCopy[]) children.toArray(new FilterCopy[0]);
					.serialize((FilterCopy[]) children
							.toArray(new FilterCopy[0]));
		FilterCopy up = parent;
		while (up != null) {
			up.serializeChildren();

Lines 37-43 Link Here

(-)src/org/eclipse/ui/internal/ide/misc/AndResourceFilter.java (-2 / +2 lines)
37	}	37	}
38	}	38	}
39		39
40	public IFileInfoFilter instantiate(IProject project, String arguments) {	40	public IFileInfoFilter instantiate(IProject project, Object arguments) {
41	return new AndFileInfoFilter(project, unserialize(project, arguments));	41	return new AndFileInfoFilter(project,(IResourceFilter[])arguments);
42	}	42	}
43	}	43	}




 *******************************************************************************/
package org.eclipse.ui.internal.ide.misc;

import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.util.LinkedList;

import org.eclipse.core.filesystem.IFileInfoFilter;
import org.eclipse.core.resources.IFilterDescriptor;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceFilter;
import org.eclipse.core.runtime.IPath;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.XMLMemento;

/**
 * Resource Filter Type allowing serializing sub filters as the arguments
 */
public class CompoundResourceFilter {

	//	private static final String T_FILTERS = "filters"; //$NON-NLS-1$

	protected IFileInfoFilter instantiate(IProject project,
			IResourceFilter filter) {

		return null;
	}

	//	private static final String T_FILTER = "filter"; //$NON-NLS-1$
	//	private static final String T_TYPE = "type"; //$NON-NLS-1$
	//	private static final String T_ID = "id"; //$NON-NLS-1$
	//	private static final String T_ARGUMENTS = "arguments"; //$NON-NLS-1$

	/**
	 * Unserialize the filters stored in a memento

	 * @param memento
	 * @return the filter array
	 */
	// public static IResourceFilter[] unserialize(final IProject project,
	// String memento) {
	// LinkedList filters = new LinkedList();
	// XMLMemento mementoObject = null;
	// try {
	// mementoObject = XMLMemento
	// .createReadRoot(new StringReader(memento));
	// } catch (WorkbenchException e) {
	// return new IResourceFilter[0];
	// }
	// IMemento childMem = mementoObject.getChild(T_FILTERS);
	// if (childMem != null) {
	// IMemento[] elementMem = childMem.getChildren(T_FILTER);
	// for (int i = 0; i < elementMem.length; i++) {
	// final String id = elementMem[i].getString(T_ID);
	// final int type = elementMem[i].getInteger(T_TYPE).intValue();
	// IMemento argumentMem = elementMem[i].getChild(T_ARGUMENTS);
	// final String arguments = argumentMem != null ? argumentMem
	//						.getTextData() : ""; //$NON-NLS-1$
	// filters.add(new IResourceFilter() {
	// public String getArguments() {
	// return arguments;
	// }
	//
	// public String getId() {
	// return id;
	// }
	//
	// public IPath getPath() {
	// return null;
	// }
	//
	// public IProject getProject() {
	// return project;
	// }
	//
	// public int getType() {
	// return type;
	// }
	// });
	// }
	// }
	// return (IResourceFilter[]) filters.toArray(new IResourceFilter[0]);
	// }

	/**
	 * Serialize filters into in a memento

	 * @param filters
	 * @return the memento
	 */
	// public static String serialize(IResourceFilter[] filters) {
	//		XMLMemento memento = XMLMemento.createWriteRoot("memento"); //$NON-NLS-1$
	//
	// IMemento expandedMem = memento.createChild(T_FILTERS);
	// for (int i = 0; i < filters.length; i++) {
	// IMemento elementMem = expandedMem.createChild(T_FILTER);
	// elementMem.putString(T_ID, filters[i].getId());
	// elementMem.putInteger(T_TYPE, filters[i].getType());
	// IMemento argumentMem = elementMem.createChild(T_ARGUMENTS);
	// argumentMem.putTextData(filters[i].getArguments());
	// }
	//
	// StringWriter writer = new StringWriter();
	// try {
	// memento.save(writer);
	// } catch (IOException e) {
	//			return ""; //$NON-NLS-1$
	// }
	// return writer.toString();
	// }

	protected abstract class FileInfoFilter implements IFileInfoFilter {
		protected IFileInfoFilter[] filterTypes;

Lines 37-43 Link Here

(-)src/org/eclipse/ui/internal/ide/misc/NotResourceFilter.java (-2 / +2 lines)
37	}	37	}
38	}	38	}
39		39
40	public IFileInfoFilter instantiate(IProject project, String arguments) {	40	public IFileInfoFilter instantiate(IProject project, Object arguments) {
41	return new NotFileInfoFilter(project, unserialize(project, arguments));	41	return new NotFileInfoFilter(project, (IResourceFilter[])arguments);
42	}	42	}
43	}	43	}

Lines 40-46 Link Here

(-)src/org/eclipse/ui/internal/ide/misc/OrResourceFilter.java (-2 / +2 lines)
40	}	40	}
41	}	41	}
42		42
43	public IFileInfoFilter instantiate(IProject project, String arguments) {	43	public IFileInfoFilter instantiate(IProject project, Object arguments) {
44	return new OrFileInfoFilter(project, unserialize(project, arguments));	44	return new OrFileInfoFilter(project, (IResourceFilter[])arguments);
45	}	45	}
46	}	46	}

Lines 51-58 Link Here

(-)src/org/eclipse/ui/internal/ide/misc/StringMatcherFilter.java (-2 / +2 lines)
51		51
52	}	52	}
53		53
54	public IFileInfoFilter instantiate(IProject project, String arguments) {	54	public IFileInfoFilter instantiate(IProject project, Object arguments) {
55	return new FilterType(arguments);	55	return new FilterType((String)arguments);
56	}	56	}
57		57
58	}	58	}

Return to bug 291755

Lines 474-480 Link Here

(-)src/org/eclipse/core/internal/resources/ProjectDescriptionReader.java (-12 / +33 lines)
474	*/	474	*/
475	private void endFilterElement(String elementName) {	475	private void endFilterElement(String elementName) {
476	if (elementName.equals(FILTER)) {	476	if (elementName.equals(FILTER)) {
477	state = S_FILTERED_RESOURCES;
478	// Pop off the filter description	477	// Pop off the filter description
479	FilterDescription filter = (FilterDescription) objectStack.pop();	478	FilterDescription filter = (FilterDescription) objectStack.pop();
480	// Make sure that you have something reasonable	479	// Make sure that you have something reasonable
Lines 495-508 Link Here
495	return;	494	return;
496	}	495	}
497		496
498	// The HashMap of filtered resources is the next thing on the stack	497	if (objectStack.peek() instanceof HashMap) {
499	HashMap map = ((HashMap) objectStack.peek());	498	state = S_FILTERED_RESOURCES;
500	LinkedList/FilterDescription/ list = (LinkedList/FilterDescription/) map.get(filter.getProjectRelativePath());	499	// The HashMap of filtered resources is the next thing on the stack
501	if (list == null) {	500	HashMap map = ((HashMap) objectStack.peek());
502	list = new LinkedList/FilterDescription/();	501	LinkedList/FilterDescription/list = (LinkedList/FilterDescription/) map.get(filter.getProjectRelativePath());
503	map.put(filter.getProjectRelativePath(), list);	502	if (list == null) {
		503	list = new LinkedList/FilterDescription/();
		504	map.put(filter.getProjectRelativePath(), list);
		505	}
		506	list.add(filter);
		507	}
		508
		509	if (objectStack.peek() instanceof ArrayList) {
		510	state = S_FILTER_ARGUMENTS;
		511	ArrayList l = ((ArrayList) objectStack.peek());
		512	l.add(filter);
504	}	513	}
505	list.add(filter);
506	}	514	}
507	}	515	}
508		516
Lines 603-611 Link Here
603		611
604	private void endFilterArguments(String elementName) {	612	private void endFilterArguments(String elementName) {
605	if (elementName.equals(ARGUMENTS)) {	613	if (elementName.equals(ARGUMENTS)) {
606	String newArguments = charBuffer.toString();	614	ArrayList filters = (ArrayList) objectStack.pop();
607	// objectStack has a FilterDescription on it. Set the type on this FilterDescription.	615	Object newArguments = charBuffer.toString();
608	String oldArguments = ((FilterDescription) objectStack.peek()).getArguments();	616
		617	if (filters.size() > 0)
		618	newArguments = filters.toArray(new IResourceFilter[filters.size()]);
		619
		620	Object oldArguments = ((FilterDescription) objectStack.peek()).getArguments();
609	if (oldArguments != null) {	621	if (oldArguments != null) {
610	parseProblem(NLS.bind(Messages.projRead_badArguments, oldArguments, newArguments));	622	parseProblem(NLS.bind(Messages.projRead_badArguments, oldArguments, newArguments));
611	} else	623	} else
Lines 958-964 Link Here
958	case S_FILTERED_RESOURCES :	970	case S_FILTERED_RESOURCES :
959	if (elementName.equals(FILTER)) {	971	if (elementName.equals(FILTER)) {
960	state = S_FILTER;	972	state = S_FILTER;
961	// Push place holders for the name, type, id and argumkents of	973	// Push place holders for the name, type, id and arguments of
962	// this filter.	974	// this filter.
963	objectStack.push(new FilterDescription());	975	objectStack.push(new FilterDescription());
964	}	976	}
Lines 972-977 Link Here
972	state = S_FILTER_ID;	984	state = S_FILTER_ID;
973	} else if (elementName.equals(ARGUMENTS)) {	985	} else if (elementName.equals(ARGUMENTS)) {
974	state = S_FILTER_ARGUMENTS;	986	state = S_FILTER_ARGUMENTS;
		987	objectStack.push(new ArrayList());
		988	}
		989	break;
		990	case S_FILTER_ARGUMENTS:
		991	if (elementName.equals(FILTER)) {
		992	state = S_FILTER;
		993	// Push place holders for the name, type, id and arguments of
		994	// this filter.
		995	objectStack.push(new FilterDescription());
975	}	996	}
976	break;	997	break;
977	case S_VARIABLE:	998	case S_VARIABLE:

Lines 707-715 Link Here

(-)src/org/eclipse/core/internal/resources/Resource.java (-4 / +4 lines)
707		707
708		708
709	/* (non-Javadoc)	709	/* (non-Javadoc)
710	* @see org.eclipse.core.resources.IContainer#addFilter(String, int, String, IProgressMonitor)	710	* @see org.eclipse.core.resources.IContainer#addFilter(String, int, Object, IProgressMonitor)
711	*/	711	*/
712	public void addFilter(String filterID, int type, String arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {	712	public void addFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {
713	Assert.isNotNull(filterID);	713	Assert.isNotNull(filterID);
714	Assert.isNotNull(getProject());	714	Assert.isNotNull(getProject());
715	monitor = Policy.monitorFor(monitor);	715	monitor = Policy.monitorFor(monitor);
Lines 754-762 Link Here
754	}	754	}
755		755
756	/* (non-Javadoc)	756	/* (non-Javadoc)
757	* @see org.eclipse.core.resources.IFolder#removeFilter(String, int, String, IProgressMonitor)	757	* @see org.eclipse.core.resources.IFolder#removeFilter(String, int, Object, IProgressMonitor)
758	*/	758	*/
759	public void removeFilter(String filterID, int type, String arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {	759	public void removeFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException {
760	Assert.isNotNull(filterID);	760	Assert.isNotNull(filterID);
761	monitor = Policy.monitorFor(monitor);	761	monitor = Policy.monitorFor(monitor);
762	try {	762	try {

Lines 90-96 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java (-9 / +5 lines)
90	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;	90	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
91	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;	91	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
92	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;	92	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
93	import org.eclipse.ui.internal.ide.misc.CompoundResourceFilter;
94	import org.eclipse.ui.plugin.AbstractUIPlugin;	93	import org.eclipse.ui.plugin.AbstractUIPlugin;
95		94
96	/**	95	/**
Lines 372-378 Link Here
372	}	371	}
373	if (column.equals(FilterTypeUtil.ARGUMENTS)) {	372	if (column.equals(FilterTypeUtil.ARGUMENTS)) {
374	if (filter.hasStringArguments())	373	if (filter.hasStringArguments())
375	return filter.getArguments();	374	return filter.getArguments().toString();
376	if ((filter.getChildrenLimit() > 0)	375	if ((filter.getChildrenLimit() > 0)
377	&& !filter.isUnderAGroupFilter())	376	&& !filter.isUnderAGroupFilter())
378	return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$	377	return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$
Lines 1310-1316 Link Here
1310		1309
1311	class FilterCopy implements IResourceFilter {	1310	class FilterCopy implements IResourceFilter {
1312	static String EMPTY = ""; //$NON-NLS-1$	1311	static String EMPTY = ""; //$NON-NLS-1$
1313	String arguments = EMPTY;	1312	Object arguments = EMPTY;
1314	String id = null;	1313	String id = null;
1315	IPath path = null;	1314	IPath path = null;
1316	IProject project = null;	1315	IProject project = null;
Lines 1386-1392 Link Here
1386	id = FilterTypeUtil.getDefaultFilterID();	1385	id = FilterTypeUtil.getDefaultFilterID();
1387	}	1386	}
1388		1387
1389	public String getArguments() {	1388	public Object getArguments() {
1390	return arguments;	1389	return arguments;
1391	}	1390	}
1392		1391
Lines 1486-1493 Link Here
1486	if (children == null) {	1485	if (children == null) {
1487	if (getChildrenLimit() > 0) {	1486	if (getChildrenLimit() > 0) {
1488	children = new LinkedList();	1487	children = new LinkedList();
1489	IResourceFilter[] filters = CompoundResourceFilter.unserialize(	1488	IResourceFilter[] filters = (IResourceFilter[])getArguments(); //CompoundResourceFilter.unserialize(getProject(), getArguments());
1490	getProject(), getArguments());
1491	for (int i = 0; i < filters.length; i++) {	1489	for (int i = 0; i < filters.length; i++) {
1492	FilterCopy child = new FilterCopy(filters[i]);	1490	FilterCopy child = new FilterCopy(filters[i]);
1493	child.parent = this;	1491	child.parent = this;
Lines 1522-1530 Link Here
1522	protected void argumentsChanged() {	1520	protected void argumentsChanged() {
1523	initializeChildren();	1521	initializeChildren();
1524	if (children != null)	1522	if (children != null)
1525	arguments = CompoundResourceFilter	1523	arguments = (FilterCopy[]) children.toArray(new FilterCopy[0]);
1526	.serialize((FilterCopy[]) children
1527	.toArray(new FilterCopy[0]));
1528	FilterCopy up = parent;	1524	FilterCopy up = parent;
1529	while (up != null) {	1525	while (up != null) {
1530	up.serializeChildren();	1526	up.serializeChildren();

Lines 10-33 Link Here

(-)src/org/eclipse/core/internal/resources/FilterDescription.java (-11 / +22 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.core.internal.resources;	11	package org.eclipse.core.internal.resources;
12		12
13	import java.util.Iterator;	13	import org.eclipse.core.resources.IProject;
14
15	import java.util.LinkedList;
16	import org.eclipse.core.runtime.IPath;	14	import org.eclipse.core.runtime.IPath;
17		15
18	import org.eclipse.core.resources.IResourceFilter;	16	import java.util.Iterator;
19		17	import java.util.LinkedList;
20	import org.eclipse.core.resources.IResource;	18	import org.eclipse.core.resources.IResource;
		19	import org.eclipse.core.resources.IResourceFilter;
21	import org.eclipse.core.runtime.*;	20	import org.eclipse.core.runtime.*;
22		21
23	/**	22	/**
24	* Class for describing the characteristics of filters that are stored	23	* Class for describing the characteristics of filters that are stored
25	* in the project description.	24	* in the project description.
26	*/	25	*/
27	public class FilterDescription implements Comparable {	26	public class FilterDescription implements Comparable, IResourceFilter {
28		27
29	private String id;	28	private String id;
30	private String arguments;	29	private Object arguments;
31		30
32	/**	31	/**
33	* The project relative path.	32	* The project relative path.
Lines 45-51 Link Here
45	this.arguments = null;	44	this.arguments = null;
46	}	45	}
47		46
48	public FilterDescription(IResource resource, int type, String filterID, String arguments) {	47	public FilterDescription(IResource resource, int type, String filterID, Object arguments) {
49	super();	48	super();
50	Assert.isNotNull(resource);	49	Assert.isNotNull(resource);
51	Assert.isNotNull(filterID);	50	Assert.isNotNull(filterID);
Lines 55-61 Link Here
55	this.arguments = arguments;	54	this.arguments = arguments;
56	}	55	}
57		56
58	public FilterDescription(IPath projectRelativePath, int type, String filterID, String arguments) {	57	private FilterDescription(IPath projectRelativePath, int type, String filterID, Object arguments) {
59	super();	58	super();
60	Assert.isNotNull(projectRelativePath);	59	Assert.isNotNull(projectRelativePath);
61	Assert.isNotNull(filterID);	60	Assert.isNotNull(filterID);
Lines 79-85 Link Here
79	return id;	78	return id;
80	}	79	}
81		80
82	public String getArguments() {	81	public Object getArguments() {
83	return arguments;	82	return arguments;
84	}	83	}
85		84
Lines 103-109 Link Here
103	this.id = id;	102	this.id = id;
104	}	103	}
105		104
106	public void setArguments(String arguments) {	105	public void setArguments(Object arguments) {
107	this.arguments = arguments;	106	this.arguments = arguments;
108	}	107	}
109		108
Lines 148-151 Link Here
148	}	147	}
149	return copy;	148	return copy;
150	}	149	}
		150
		151	public String getId() {
		152	return id;
		153	}
		154
		155	public IPath getPath() {
		156	return path;
		157	}
		158
		159	public IProject getProject() {
		160	return null;
		161	}
151	}	162	}

Lines 20-27 Link Here

(-)src/org/eclipse/core/internal/resources/ModelObjectWriter.java (-9 / +22 lines)
20	import org.eclipse.core.internal.events.BuildCommand;	20	import org.eclipse.core.internal.events.BuildCommand;
21	import org.eclipse.core.internal.localstore.SafeFileOutputStream;	21	import org.eclipse.core.internal.localstore.SafeFileOutputStream;
22	import org.eclipse.core.internal.utils.FileUtil;	22	import org.eclipse.core.internal.utils.FileUtil;
23	import org.eclipse.core.resources.IProject;	23	import org.eclipse.core.resources.*;
24	import org.eclipse.core.resources.IncrementalProjectBuilder;
25	import org.eclipse.core.runtime.IPath;	24	import org.eclipse.core.runtime.IPath;
26		25
27	//	26	//
Lines 93-106 Link Here
93	writer.endTag(LINK);	92	writer.endTag(LINK);
94	}	93	}
95		94
96	protected void write(FilterDescription description, XMLWriter writer) {	95	protected void write(IResourceFilter description, XMLWriter writer) {
97	writer.startTag(FILTER, null);	96	writer.startTag(FILTER, null);
98	if (description != null) {	97	if (description != null) {
99	writer.printSimpleTag(NAME, description.getProjectRelativePath());	98	writer.printSimpleTag(NAME, description.getPath());
100	writer.printSimpleTag(TYPE, Integer.toString(description.getType()));	99	writer.printSimpleTag(TYPE, Integer.toString(description.getType()));
101	writer.printSimpleTag(ID, description.getFilterID());	100	writer.printSimpleTag(ID, description.getId());
102	if (description.getArguments() != null)	101	if (description.getArguments() != null){
103	writer.printSimpleTag(ARGUMENTS, description.getArguments());	102	if (description.getArguments() instanceof String){
		103	writer.printSimpleTag(ARGUMENTS, description.getArguments());
		104	}
		105	else if (description.getArguments() instanceof IResourceFilter[]){
		106	writer.startTag(ARGUMENTS, null);
		107	IResourceFilter[] array = (IResourceFilter[])description.getArguments();
		108	for (int i=0; i< array.length; i ++){
		109	write(array[i], writer);
		110	}
		111	writer.endTag(ARGUMENTS);
		112	}
		113	else writer.printSimpleTag(ARGUMENTS, ""); //$NON-NLS-1$
		114
		115	}
		116
104	}	117	}
105	writer.endTag(FILTER);	118	writer.endTag(FILTER);
106	}	119	}
Lines 176-183 Link Here
176	write((LinkDescription) obj, writer);	189	write((LinkDescription) obj, writer);
177	return;	190	return;
178	}	191	}
179	if (obj instanceof FilterDescription) {	192	if (obj instanceof IResourceFilter) {
180	write((FilterDescription) obj, writer);	193	write((IResourceFilter) obj, writer);
181	return;	194	return;
182	}	195	}
183	if (obj instanceof VariableDescription) {	196	if (obj instanceof VariableDescription) {

Lines 484-495 Link Here

(-)src/org/eclipse/core/resources/IContainer.java (-6 / +6 lines)
484	* @exception OperationCanceledException if the operation is canceled.	484	* @exception OperationCanceledException if the operation is canceled.
485	* Cancelation can occur even if no progress monitor is provided.	485	* Cancelation can occur even if no progress monitor is provided.
486	*	486	*
487	* @see IContainer#removeFilter(String, int, String, int, IProgressMonitor)	487	* @see IContainer#removeFilter(String, int, Object, int, IProgressMonitor)
488	* @see IContainer#getFilters()	488	* @see IContainer#getFilters()
489	*	489	*
490	* @since 3.6	490	* @since 3.6
491	*/	491	*/
492	public void addFilter(String filterID, int type, String arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;	492	public void addFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;
493		493
494	/**	494	/**
495	* Remove the filter matching the arguments from this folder's filter list	495	* Remove the filter matching the arguments from this folder's filter list
Lines 508-519 Link Here
508	* @exception OperationCanceledException if the operation is canceled.	508	* @exception OperationCanceledException if the operation is canceled.
509	* Cancelation can occur even if no progress monitor is provided.	509	* Cancelation can occur even if no progress monitor is provided.
510	*	510	*
511	* @see IContainer#addFilter(String, int, String, int, IProgressMonitor)	511	* @see IContainer#addFilter(String, int, Object, int, IProgressMonitor)
512	* @see IContainer#getFilters()	512	* @see IContainer#getFilters()
513	*	513	*
514	* @since 3.6	514	* @since 3.6
515	*/	515	*/
516	public void removeFilter(String filterID, int type, String arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;	516	public void removeFilter(String filterID, int type, Object arguments, int updateFlags, IProgressMonitor monitor) throws CoreException;
517		517
518	/**	518	/**
519	* Retrieve the filters for this folder.	519	* Retrieve the filters for this folder.
Lines 524-531 Link Here
524	* <ul>	524	* <ul>
525	* <li> This resource is not a folder.</li>	525	* <li> This resource is not a folder.</li>
526	*	526	*
527	* @see IContainer#addFilter(String, int, String, int, IProgressMonitor)	527	* @see IContainer#addFilter(String, int, Object, int, IProgressMonitor)
528	* @see IContainer#removeFilter(String, int, String, int, IProgressMonitor)	528	* @see IContainer#removeFilter(String, int, Object, int, IProgressMonitor)
529	*	529	*
530	* @since 3.6	530	* @since 3.6
531	*/	531	*/