Attachment #149964 for bug #291755

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

Lines 7-12 Link Here

(-)src/org/eclipse/core/internal/resources/Filter.java (-1 / +2 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Serge Beauchamp (Freescale Semiconductor) - initial API and implementation	9	* Serge Beauchamp (Freescale Semiconductor) - initial API and implementation
		10	* IBM Corporation - ongoing implementation
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.core.internal.resources;	12	package org.eclipse.core.internal.resources;
12		13
Lines 64-70 Link Here
64	return false;	65	return false;
65	}	66	}
66		67
67	public String getArguments() {	68	public Object getArguments() {
68	return description.getArguments();	69	return description.getArguments();
69	}	70	}
70		71




 * 
 * Contributors:
 *     Serge Beauchamp (Freescale Semiconductor) - initial API and implementation
 *     IBM Corporation - ongoing implementation
 *******************************************************************************/
package org.eclipse.core.internal.resources;

import java.util.Iterator;

import java.util.LinkedList;
import org.eclipse.core.resources.*;

import org.eclipse.core.resources.IResourceFilter;

import org.eclipse.core.resources.IResource;
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);

		if (!(o.getClass() == FilterDescription.class))
			return false;
		FilterDescription other = (FilterDescription) o;
		return path.equals(other.path) && type == other.type && id.equals(other.id) && ((arguments == null) ? (arguments == other.arguments) : (arguments.equals(other.arguments)));
				type == other.type &&
				id.equals(other.id)&&
				((arguments == null) ? (arguments == other.arguments) : (arguments.equals(other.arguments)));
	}

	public String getFilterID() {
		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;

//

		//cases to avoid dirtying .project files unnecessarily.	
		if (!command.isConfigurable())
			return false;
		return !command.isBuilding(IncrementalProjectBuilder.AUTO_BUILD) || !command.isBuilding(IncrementalProjectBuilder.CLEAN_BUILD) || !command.isBuilding(IncrementalProjectBuilder.FULL_BUILD) || !command.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD);
			!command.isBuilding(IncrementalProjectBuilder.CLEAN_BUILD) || 
			!command.isBuilding(IncrementalProjectBuilder.FULL_BUILD) || 
			!command.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD);
	}

	protected void write(LinkDescription description, XMLWriter writer) {

		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) {

	protected void write(String name, Map table, XMLWriter writer) {
		writer.startTag(name, null);
		if (table != null) {
			// ensure consistent order of map elements
			List sorted = new ArrayList(table.keySet());
			Collections.sort(sorted);

			for (Iterator it = sorted.iterator(); it.hasNext();) {
				String key = (String) it.next();
				Object value = table.get(key);
				writer.startTag(DICTIONARY, null);
				{
					writer.printSimpleTag(KEY, key);
					writer.printSimpleTag(VALUE, value);
				}
				writer.endTag(DICTIONARY);
			}
		}
		writer.endTag(name);




	 */
	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;

/**

		}

		boolean changed = false;
		public LinkedList/* <IResourceFilter> */trash = new LinkedList/*
																	 * <IResourceFilter
																	 * >
																	 */();

		public void add(FilterCopy newFilter) {
			super.addChild(newFilter);

								.bind(
										IDEWorkbenchMessages.ResourceFilterPage_includeOnlyColumn,
										null);
					return NLS
							.bind(
									IDEWorkbenchMessages.ResourceFilterPage_excludeAllColumn,
									null);
				}
				return getFilterTypeName(filter);
			}

									IDEWorkbenchMessages.ResourceFilterPage_filesColumn,
									null);
				if (includeFolders)
					return NLS
							.bind(
									IDEWorkbenchMessages.ResourceFilterPage_foldersColumn,
									null);
			}
			if (column.equals(FilterTypeUtil.ARGUMENTS)) {
				if (filter.hasStringArguments())
					return filter.getArguments() != null ? filter
							.getArguments().toString() : ""; //$NON-NLS-1$
				if ((filter.getChildrenLimit() > 0)
						&& !filter.isUnderAGroupFilter())
					return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$

			else
				filter.setType(type);
		}
		if (property.equals(FilterTypeUtil.ARGUMENTS)) {
			filter.setArguments(value.equals("") ? null : value); //$NON-NLS-1$
		}
	}

	static IFilterDescriptor getDescriptor(String id) {

					(filter.getType() & IResourceFilter.INHERITABLE) != 0);

		if (property.equals(ARGUMENTS))
			return filter.getArguments() != null ? filter.getArguments() : ""; //$NON-NLS-1$
		return null;
	}


}

class FilterCopy implements IResourceFilter {
	Object arguments = null;
	String arguments = EMPTY;
	String id = null;
	IPath path = null;
	IProject project = null;

		path = filter.getPath();
		project = filter.getProject();
		type = filter.getType();
		if (arguments == null)
			arguments = EMPTY;
	}

	public boolean hasChanged() {

		id = FilterTypeUtil.getDefaultFilterID();
	}

	public Object getArguments() {
		return arguments;
	}


		return type;
	}

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

		if (children == null) {
			if (getChildrenLimit() > 0) {
				children = new LinkedList();
				IResourceFilter[] filters = (IResourceFilter[]) getArguments();
				if (filters != null)
					for (int i = 0; i < filters.length; i++) {
						FilterCopy child = new FilterCopy(filters[i]);
						child.parent = this;
						children.add(child);
					}
			}
		}
	}

	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();

	 * 
	 */
	private void setArgumentLabelEnabled() {
		Color color = argumentsLabel.getDisplay().getSystemColor(
				filter.hasStringArguments() ? SWT.COLOR_BLACK : SWT.COLOR_GRAY);
		argumentsLabel.setForeground(color);
	}


	private void createIdArea(Font font, Composite composite) {
		GridData data;
		Group idComposite = createGroup(font, composite, NLS.bind(
				IDEWorkbenchMessages.ResourceFilterPage_columnFilterID, null),
				true);
		idCombo = new Combo(idComposite, SWT.READ_ONLY);
		idCombo.setItems(FilterTypeUtil.getFilterNames(filter
				.getChildrenLimit() > 0));

	 * @param composite
	 * @return the group
	 */
	private Group createGroup(Font font, Composite composite, String text,
			boolean grabExcessVerticalSpace) {
		GridLayout layout;
		GridData data;
		Group modeComposite = new Group(composite, SWT.NONE);

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) {
		IFilterDescriptor desc = project.getWorkspace().getFilterDescriptor(

		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 project
	 * @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;
		protected IResourceFilter[] filters;

		public FileInfoFilter(IProject project, IResourceFilter[] filters) {
			this.filters = filters;
			filterTypes = new IFileInfoFilter[filters!=null ? filters.length : 0];
			for (int i = 0; i < filterTypes.length; i++)
				filterTypes[i] = instantiate(project, filters[i]);
		}
	}

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 20-27 Link Here

(-)src/org/eclipse/core/internal/resources/ModelObjectWriter.java (-26 / +35 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 76-85 Link Here
76	//cases to avoid dirtying .project files unnecessarily.	75	//cases to avoid dirtying .project files unnecessarily.
77	if (!command.isConfigurable())	76	if (!command.isConfigurable())
78	return false;	77	return false;
79	return !command.isBuilding(IncrementalProjectBuilder.AUTO_BUILD) \|\|	78	return !command.isBuilding(IncrementalProjectBuilder.AUTO_BUILD) \|\| !command.isBuilding(IncrementalProjectBuilder.CLEAN_BUILD) \|\| !command.isBuilding(IncrementalProjectBuilder.FULL_BUILD) \|\| !command.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD);
80	!command.isBuilding(IncrementalProjectBuilder.CLEAN_BUILD) \|\|
81	!command.isBuilding(IncrementalProjectBuilder.FULL_BUILD) \|\|
82	!command.isBuilding(IncrementalProjectBuilder.INCREMENTAL_BUILD);
83	}	79	}
84		80
85	protected void write(LinkDescription description, XMLWriter writer) {	81	protected void write(LinkDescription description, XMLWriter writer) {
Lines 93-106 Link Here
93	writer.endTag(LINK);	89	writer.endTag(LINK);
94	}	90	}
95		91
96	protected void write(FilterDescription description, XMLWriter writer) {	92	protected void write(IResourceFilter description, XMLWriter writer) {
97	writer.startTag(FILTER, null);	93	writer.startTag(FILTER, null);
98	if (description != null) {	94	if (description != null) {
99	writer.printSimpleTag(NAME, description.getProjectRelativePath());	95	writer.printSimpleTag(NAME, description.getPath());
100	writer.printSimpleTag(TYPE, Integer.toString(description.getType()));	96	writer.printSimpleTag(TYPE, Integer.toString(description.getType()));
101	writer.printSimpleTag(ID, description.getFilterID());	97	writer.printSimpleTag(ID, description.getId());
102	if (description.getArguments() != null)	98	if (description.getArguments() != null) {
103	writer.printSimpleTag(ARGUMENTS, description.getArguments());	99	if (description.getArguments() instanceof String) {
		100	writer.printSimpleTag(ARGUMENTS, description.getArguments());
		101	} else if (description.getArguments() instanceof IResourceFilter[]) {
		102	writer.startTag(ARGUMENTS, null);
		103	IResourceFilter[] array = (IResourceFilter[]) description.getArguments();
		104	for (int i = 0; i < array.length; i++) {
		105	write(array[i], writer);
		106	}
		107	writer.endTag(ARGUMENTS);
		108	} else
		109	writer.printSimpleTag(ARGUMENTS, ""); //$NON-NLS-1$
		110
		111	}
		112
104	}	113	}
105	writer.endTag(FILTER);	114	writer.endTag(FILTER);
106	}	115	}
Lines 176-183 Link Here
176	write((LinkDescription) obj, writer);	185	write((LinkDescription) obj, writer);
177	return;	186	return;
178	}	187	}
179	if (obj instanceof FilterDescription) {	188	if (obj instanceof IResourceFilter) {
180	write((FilterDescription) obj, writer);	189	write((IResourceFilter) obj, writer);
181	return;	190	return;
182	}	191	}
183	if (obj instanceof VariableDescription) {	192	if (obj instanceof VariableDescription) {
Lines 237-255 Link Here
237	protected void write(String name, Map table, XMLWriter writer) {	246	protected void write(String name, Map table, XMLWriter writer) {
238	writer.startTag(name, null);	247	writer.startTag(name, null);
239	if (table != null) {	248	if (table != null) {
240	// ensure consistent order of map elements	249	// ensure consistent order of map elements
241	List sorted = new ArrayList(table.keySet());	250	List sorted = new ArrayList(table.keySet());
242	Collections.sort(sorted);	251	Collections.sort(sorted);
243		252
244	for (Iterator it = sorted.iterator(); it.hasNext();) {	253	for (Iterator it = sorted.iterator(); it.hasNext();) {
245	String key = (String) it.next();	254	String key = (String) it.next();
246	Object value = table.get(key);	255	Object value = table.get(key);
247	writer.startTag(DICTIONARY, null);	256	writer.startTag(DICTIONARY, null);
248	{	257	{
249	writer.printSimpleTag(KEY, key);	258	writer.printSimpleTag(KEY, key);
250	writer.printSimpleTag(VALUE, value);	259	writer.printSimpleTag(VALUE, value);
251	}	260	}
252	writer.endTag(DICTIONARY);	261	writer.endTag(DICTIONARY);
253	}	262	}
254	}	263	}
255	writer.endTag(name);	264	writer.endTag(name);

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 91-97 Link Here

(-)src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterGroup.java (-31 / +35 lines)
91	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;	91	import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
92	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;	92	import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
93	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;	93	import org.eclipse.ui.internal.ide.IIDEHelpContextIds;
94	import org.eclipse.ui.internal.ide.misc.CompoundResourceFilter;
95	import org.eclipse.ui.plugin.AbstractUIPlugin;	94	import org.eclipse.ui.plugin.AbstractUIPlugin;
96		95
97	/**	96	/**
Lines 179-185 Link Here
179	}	178	}
180		179
181	boolean changed = false;	180	boolean changed = false;
182	public LinkedList/* <IResourceFilter> /trash = new LinkedList/ <IResourceFilter> */();	181	public LinkedList/* <IResourceFilter> /trash = new LinkedList/
		182	* <IResourceFilter
		183	* >
		184	*/();
183		185
184	public void add(FilterCopy newFilter) {	186	public void add(FilterCopy newFilter) {
185	super.addChild(newFilter);	187	super.addChild(newFilter);
Lines 347-355 Link Here
347	.bind(	349	.bind(
348	IDEWorkbenchMessages.ResourceFilterPage_includeOnlyColumn,	350	IDEWorkbenchMessages.ResourceFilterPage_includeOnlyColumn,
349	null);	351	null);
350	return NLS.bind(	352	return NLS
351	IDEWorkbenchMessages.ResourceFilterPage_excludeAllColumn,	353	.bind(
352	null);	354	IDEWorkbenchMessages.ResourceFilterPage_excludeAllColumn,
		355	null);
353	}	356	}
354	return getFilterTypeName(filter);	357	return getFilterTypeName(filter);
355	}	358	}
Lines 367-379 Link Here
367	IDEWorkbenchMessages.ResourceFilterPage_filesColumn,	370	IDEWorkbenchMessages.ResourceFilterPage_filesColumn,
368	null);	371	null);
369	if (includeFolders)	372	if (includeFolders)
370	return NLS.bind(	373	return NLS
371	IDEWorkbenchMessages.ResourceFilterPage_foldersColumn,	374	.bind(
372	null);	375	IDEWorkbenchMessages.ResourceFilterPage_foldersColumn,
		376	null);
373	}	377	}
374	if (column.equals(FilterTypeUtil.ARGUMENTS)) {	378	if (column.equals(FilterTypeUtil.ARGUMENTS)) {
375	if (filter.hasStringArguments())	379	if (filter.hasStringArguments())
376	return filter.getArguments();	380	return filter.getArguments() != null ? filter
		381	.getArguments().toString() : ""; //$NON-NLS-1$
377	if ((filter.getChildrenLimit() > 0)	382	if ((filter.getChildrenLimit() > 0)
378	&& !filter.isUnderAGroupFilter())	383	&& !filter.isUnderAGroupFilter())
379	return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$	384	return "< " + getFilterTypeName(filter) + " >"; //$NON-NLS-1$ //$NON-NLS-2$
Lines 1156-1163 Link Here
1156	else	1161	else
1157	filter.setType(type);	1162	filter.setType(type);
1158	}	1163	}
1159	if (property.equals(FilterTypeUtil.ARGUMENTS))	1164	if (property.equals(FilterTypeUtil.ARGUMENTS)) {
1160	filter.setArguments((String) value);	1165	filter.setArguments(value.equals("") ? null : value); //$NON-NLS-1$
		1166	}
1161	}	1167	}
1162		1168
1163	static IFilterDescriptor getDescriptor(String id) {	1169	static IFilterDescriptor getDescriptor(String id) {
Lines 1206-1212 Link Here
1206	(filter.getType() & IResourceFilter.INHERITABLE) != 0);	1212	(filter.getType() & IResourceFilter.INHERITABLE) != 0);
1207		1213
1208	if (property.equals(ARGUMENTS))	1214	if (property.equals(ARGUMENTS))
1209	return filter.getArguments();	1215	return filter.getArguments() != null ? filter.getArguments() : ""; //$NON-NLS-1$
1210	return null;	1216	return null;
1211	}	1217	}
1212		1218
Lines 1310-1317 Link Here
1310	}	1316	}
1311		1317
1312	class FilterCopy implements IResourceFilter {	1318	class FilterCopy implements IResourceFilter {
1313	static String EMPTY = ""; //$NON-NLS-1$	1319	Object arguments = null;
1314	String arguments = EMPTY;
1315	String id = null;	1320	String id = null;
1316	IPath path = null;	1321	IPath path = null;
1317	IProject project = null;	1322	IProject project = null;
Lines 1366-1373 Link Here
1366	path = filter.getPath();	1371	path = filter.getPath();
1367	project = filter.getProject();	1372	project = filter.getProject();
1368	type = filter.getType();	1373	type = filter.getType();
1369	if (arguments == null)
1370	arguments = EMPTY;
1371	}	1374	}
1372		1375
1373	public boolean hasChanged() {	1376	public boolean hasChanged() {
Lines 1387-1393 Link Here
1387	id = FilterTypeUtil.getDefaultFilterID();	1390	id = FilterTypeUtil.getDefaultFilterID();
1388	}	1391	}
1389		1392
1390	public String getArguments() {	1393	public Object getArguments() {
1391	return arguments;	1394	return arguments;
1392	}	1395	}
1393		1396
Lines 1407-1413 Link Here
1407	return type;	1410	return type;
1408	}	1411	}
1409		1412
1410	public void setArguments(String arguments) {	1413	public void setArguments(Object arguments) {
1411	this.arguments = arguments;	1414	this.arguments = arguments;
1412	argumentsChanged();	1415	argumentsChanged();
1413	}	1416	}
Lines 1487-1499 Link Here
1487	if (children == null) {	1490	if (children == null) {
1488	if (getChildrenLimit() > 0) {	1491	if (getChildrenLimit() > 0) {
1489	children = new LinkedList();	1492	children = new LinkedList();
1490	IResourceFilter[] filters = CompoundResourceFilter.unserialize(	1493	IResourceFilter[] filters = (IResourceFilter[]) getArguments();
1491	getProject(), getArguments());	1494	if (filters != null)
1492	for (int i = 0; i < filters.length; i++) {	1495	for (int i = 0; i < filters.length; i++) {
1493	FilterCopy child = new FilterCopy(filters[i]);	1496	FilterCopy child = new FilterCopy(filters[i]);
1494	child.parent = this;	1497	child.parent = this;
1495	children.add(child);	1498	children.add(child);
1496	}	1499	}
1497	}	1500	}
1498	}	1501	}
1499	}	1502	}
Lines 1523-1531 Link Here
1523	protected void argumentsChanged() {	1526	protected void argumentsChanged() {
1524	initializeChildren();	1527	initializeChildren();
1525	if (children != null)	1528	if (children != null)
1526	arguments = CompoundResourceFilter	1529	arguments = (FilterCopy[]) children.toArray(new FilterCopy[0]);
1527	.serialize((FilterCopy[]) children
1528	.toArray(new FilterCopy[0]));
1529	FilterCopy up = parent;	1530	FilterCopy up = parent;
1530	while (up != null) {	1531	while (up != null) {
1531	up.serializeChildren();	1532	up.serializeChildren();
Lines 1680-1686 Link Here
1680	*	1681	*
1681	*/	1682	*/
1682	private void setArgumentLabelEnabled() {	1683	private void setArgumentLabelEnabled() {
1683	Color color = argumentsLabel.getDisplay().getSystemColor(filter.hasStringArguments() ? SWT.COLOR_BLACK : SWT.COLOR_GRAY);	1684	Color color = argumentsLabel.getDisplay().getSystemColor(
		1685	filter.hasStringArguments() ? SWT.COLOR_BLACK : SWT.COLOR_GRAY);
1684	argumentsLabel.setForeground(color);	1686	argumentsLabel.setForeground(color);
1685	}	1687	}
1686		1688
Lines 1707-1713 Link Here
1707	private void createIdArea(Font font, Composite composite) {	1709	private void createIdArea(Font font, Composite composite) {
1708	GridData data;	1710	GridData data;
1709	Group idComposite = createGroup(font, composite, NLS.bind(	1711	Group idComposite = createGroup(font, composite, NLS.bind(
1710	IDEWorkbenchMessages.ResourceFilterPage_columnFilterID, null), true);	1712	IDEWorkbenchMessages.ResourceFilterPage_columnFilterID, null),
		1713	true);
1711	idCombo = new Combo(idComposite, SWT.READ_ONLY);	1714	idCombo = new Combo(idComposite, SWT.READ_ONLY);
1712	idCombo.setItems(FilterTypeUtil.getFilterNames(filter	1715	idCombo.setItems(FilterTypeUtil.getFilterNames(filter
1713	.getChildrenLimit() > 0));	1716	.getChildrenLimit() > 0));
Lines 1797-1803 Link Here
1797	* @param composite	1800	* @param composite
1798	* @return the group	1801	* @return the group
1799	*/	1802	*/
1800	private Group createGroup(Font font, Composite composite, String text, boolean grabExcessVerticalSpace) {	1803	private Group createGroup(Font font, Composite composite, String text,
		1804	boolean grabExcessVerticalSpace) {
1801	GridLayout layout;	1805	GridLayout layout;
1802	GridData data;	1806	GridData data;
1803	Group modeComposite = new Group(composite, SWT.NONE);	1807	Group modeComposite = new Group(composite, SWT.NONE);

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	*/