Attachment #154680 for bug #298100

View | Details | Raw Unified | Return to bug 298100
Collapse All | Expand All




         </run>
      </filesystem>
   </extension>
   <extension
         id="filtermarker"
         name="Filter Marker"
         point="org.eclipse.core.resources.markers">
      <super
            type="org.eclipse.core.resources.marker">
      </super>
      <persistent
            value="false">
      </persistent>
      <attribute
            name="type">
      </attribute>
      <attribute
            name="matcherDescription">
      </attribute>
   </extension>
</plugin>




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

import java.util.LinkedList;
import org.eclipse.core.filesystem.EFS;
import org.eclipse.core.filesystem.IFileStore;
import org.eclipse.core.internal.resources.*;

				return false;
			}
			// update filters in project descriptions
//			if (source.hasFilters()) {
//				Project sourceProject = (Project) source.getProject();
//				LinkedList/*<FilterDescription>*/originalDescriptions = sourceProject.internalGetDescription().getFilter(source.getProjectRelativePath());
//				LinkedList/*<FilterDescription>*/filterDescriptions = FilterDescription.copy(originalDescriptions, destination);
//				Project project = (Project) destination.getProject();
//				project.internalGetDescription().setFilters(destination.getProjectRelativePath(), filterDescriptions);
//				project.writeDescription(updateFlags);
//			}

			IFileStore sourceStore = node.getStore();
			IFileStore destinationStore = destination.getStore();




package org.eclipse.core.internal.resources;

import java.util.HashMap;
import org.eclipse.core.resources.*;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
import org.eclipse.core.runtime.*;



	public void startup(IProgressMonitor monitor) {
		//nothing to do

//		ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
//			public void resourceChanged(IResourceChangeEvent event) {
//				IMarkerDelta[] mDelta = event.getDelta().getMarkerDeltas();
//				if (mDelta.length != 0) {
//					if (mDelta[0].getKind() == IResourceDelta.ADDED) {
//						try {
//							((ProjectDescription) mDelta[0].getResource().getProject().getDescription()).addFilterDescription(new FilterDescription(mDelta[0].getResource(), ((Integer) mDelta[0].getAttribute("type")).intValue(), //$NON-NLS-1$
//									(FileInfoMatcherDescription) mDelta[0].getAttribute("matcherDescription"))); //$NON-NLS-1$
//							((Project)mDelta[0].getResource().getProject()).writeDescription(IResource.NONE);
//						} catch (CoreException e) {
//							// TODO Auto-generated catch block
//							e.printStackTrace();
//						}
//					}
//				}
//			}
//		}, IResourceChangeEvent.POST_CHANGE);
	}
}




				Collections.sort(sorted);
				write(LINKED_RESOURCES, sorted, writer);
			}
			
//			HashMap filters = description.getFilters();
//			if (filters != null) {
//				List sorted = new ArrayList();
//				for (Iterator it = filters.values().iterator(); it.hasNext();) {
//					List list = (List) it.next();
//					sorted.addAll(list);
//				}
//				Collections.sort(sorted);
//				write(FILTERED_RESOURCES, sorted, writer);
//			}
			HashMap variables = description.getVariables();
			if (variables != null) {
				List sorted = new ArrayList(variables.values());




	 * Returns the filter for the given resource name. Returns null if
	 * no such filter exists.
	 */
//	synchronized public LinkedList/*<FilterDescription>*/ getFilter(IPath aPath) {
//		if (filterDescriptions == null)
//			return null;
//		return (LinkedList /*<FilterDescription> */) filterDescriptions.get(aPath);
//	}

	/**
	 * Returns the map of link descriptions (IPath (project relative path) -> LinkDescription).

	 * Since this method is only used internally, it never creates a copy.
	 * Returns null if the project does not have any filtered resources.
	 */
//	public HashMap getFilters() {
//		return filterDescriptions;
//	}

	/**
	 * Returns the map of variable descriptions (String (variable name) ->

		if (!Arrays.equals(natures, description.getNatureIds(false)))
			return true;
		
//		HashMap otherFilters = description.getFilters();
//		if ((filterDescriptions == null) && (otherFilters != null))
//			return otherFilters != null;
//		if ((filterDescriptions != null) && !filterDescriptions.equals(otherFilters))
//			return true;

		HashMap otherVariables = description.getVariables();
		if ((variableDescriptions == null) && (otherVariables != null))

	 * Add the description of a filter. Setting to a description of null will
	 * remove the filter from the project description.
	 */
//	synchronized public void addFilter(IPath path, FilterDescription description) {
//		Assert.isNotNull(description);
//		if (filterDescriptions == null)
//			filterDescriptions = new HashMap(10);
//		LinkedList/*<FilterDescription>*/ descList = (LinkedList /*<FilterDescription> */) filterDescriptions.get(path);
//		if (descList == null) {
//			descList = new LinkedList/*<FilterDescription>*/();
//			filterDescriptions.put(path, descList);
//		}
//		descList.add(description);
//	}
	
	LinkedList descList = new LinkedList();
	
	public void addFilterDescription(FilterDescription description) {
		descList.add(description);
	}
	
	public void removeFilterDescription(FilterDescription description) {
		descList.remove(description);
	}
	
	/**
	 * Add the description of a filter. Setting to a description of null will
	 * remove the filter from the project description.
	 */
//	synchronized public void removeFilter(IPath path, FilterDescription description) {
//		if (filterDescriptions != null) {
//			LinkedList/*<FilterDescription>*/ descList = (LinkedList /*<FilterDescription> */) filterDescriptions.get(path);
//			if (descList != null) {
//				descList.remove(description);
//				if (descList.size() == 0) {
//					filterDescriptions.remove(path);
//					if (filterDescriptions.size() == 0)
//						filterDescriptions = null;
//				}
//			}
//		}
//	}

	/**
	 * Sets the description of a variable. Setting to a description of null will




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

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;

import org.eclipse.core.internal.utils.Messages;
import org.eclipse.core.internal.utils.Policy;
import org.eclipse.core.runtime.OperationCanceledException;

import java.net.URI;
import java.net.URISyntaxException;

	 * @see IContainer#createFilter(int, IFileInfoMatcherDescription, int, IProgressMonitor)
	 */
	public IResourceFilterDescription createFilter(int type, IFileInfoMatcherDescription matcherDescription, int updateFlags, IProgressMonitor monitor) throws CoreException {
		//		Assert.isNotNull(getProject());
		//		monitor = Policy.monitorFor(monitor);
		FilterDescription filter = null;
		//		try {
		//			String message = NLS.bind(Messages.links_creating, getFullPath());
		//			monitor.beginTask(message, Policy.totalWork);
		//			Policy.checkCanceled(monitor);
		//			checkValidPath(path, FOLDER | PROJECT, true);
		//			final ISchedulingRule rule = workspace.getRuleFactory().createRule(this);
		//			try {
		//				workspace.prepareOperation(rule, monitor);
		//				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_FILTER_ADD, this));
		//				workspace.beginOperation(true);
		//				monitor.worked(Policy.opWork * 5 / 100);
		//save the filter in the project description
		filter = new FilterDescription(this, type, matcherDescription);
		//				filter.setId(System.currentTimeMillis());

		//				Project project = (Project) getProject();
		//				project.internalGetDescription().addFilter(getProjectRelativePath(), filter);
		//				project.writeDescription(IResource.NONE);
		//				monitor.worked(Policy.opWork * 5 / 100);

		IMarker filterMarker = createMarker("org.eclipse.core.resources.filtermarker"); //$NON-NLS-1$
		filterMarker.setAttribute("type", new Integer(type)); //$NON-NLS-1$
		filterMarker.setAttribute("matcherDescription", matcherDescription); //$NON-NLS-1$
		filter.setId(filterMarker.getId());

		//refresh to discover any new resources below this folder
						if (getType() != IResource.FILE) {
							//refresh either in background or foreground
							if ((updateFlags & IResource.BACKGROUND_REFRESH) != 0) {
								workspace.refreshManager.refresh(this);
//								monitor.worked(Policy.opWork * 90 / 100);
							} else {
								refreshLocal(DEPTH_INFINITE, null/*Policy.subMonitorFor(monitor, Policy.opWork * 90 / 100)*/);
							}
						}
//						} else
		//					monitor.worked(Policy.opWork * 90 / 100);
		//			} catch (OperationCanceledException e) {
							
		//				workspace.getWorkManager().operationCanceled();
		//				throw e;
		//			} finally {
		//				workspace.endOperation(rule, true, Policy.subMonitorFor(monitor, Policy.endOpWork));
		//			}
		//		} finally {
		//			monitor.done();
		//		}
		return filter;
	}

	public void removeFilter(IResourceFilterDescription filterDescription, int updateFlags, IProgressMonitor monitor) throws CoreException {
		//		monitor = Policy.monitorFor(monitor);
		//		try {
		//			String message = NLS.bind(Messages.links_creating, getFullPath());
		//			monitor.beginTask(message, Policy.totalWork);
		//			Policy.checkCanceled(monitor);
		//			checkValidPath(path, FOLDER | PROJECT, true);
		//			final ISchedulingRule rule = workspace.getRuleFactory().createRule(this);
		//			try {
		//				workspace.prepareOperation(rule, monitor);
		//				workspace.broadcastEvent(LifecycleEvent.newEvent(LifecycleEvent.PRE_FILTER_REMOVE, this));
		//				workspace.beginOperation(true);
		//				monitor.worked(Policy.opWork * 5 / 100);
		//				//save the filter in the project description
		//				Project project = (Project) getProject();
		//				project.internalGetDescription().removeFilter(getProjectRelativePath(), (FilterDescription)filterDescription);
		//				project.writeDescription(IResource.NONE);
		//				monitor.worked(Policy.opWork * 5 / 100);

		IMarker filterMarker = findMarker(((FilterDescription) filterDescription).getId());
		filterMarker.delete();

		//				//refresh to discover any new resources below this linked location
						if (getType() != IResource.FILE) {
							//refresh either in background or foreground
							if ((updateFlags & IResource.BACKGROUND_REFRESH) != 0) {
								workspace.refreshManager.refresh(this);
//								monitor.worked(Policy.opWork * 90 / 100);
							} else {
								refreshLocal(DEPTH_INFINITE, null /*Policy.subMonitorFor(monitor, Policy.opWork * 90 / 100)*/);
							}
						}
		//				} else
		//					monitor.worked(Policy.opWork * 90 / 100);
		//			} catch (OperationCanceledException e) {
		//				workspace.getWorkManager().operationCanceled();
		//				throw e;
		//			} finally {
		//				workspace.endOperation(rule, true, Policy.subMonitorFor(monitor, Policy.endOpWork));
		//			}
		//		} finally {
		//			monitor.done();
		//		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.resources.IContainer#getFilters()
	 */
	public IResourceFilterDescription[] getFilters() throws CoreException {
		IMarker[] filterMarkers = findMarkers("org.eclipse.core.resources.filtermarker", false, IResource.DEPTH_ZERO); //$NON-NLS-1$
		
		FilterDescription[] filterDescriptions = new FilterDescription[filterMarkers.length];
		
		for (int i = 0; i < filterMarkers.length; i++) {
			FilterDescription filterDescription = new FilterDescription(this, ((Integer) filterMarkers[i].getAttribute("type")).intValue(), //$NON-NLS-1$
					(FileInfoMatcherDescription) filterMarkers[i].getAttribute("matcherDescription")); //$NON-NLS-1$
			filterDescription.setId(filterMarkers[i].getId());
			filterDescriptions[i] = filterDescription;
					results[i] = (FilterDescription) list.get(i);
				}
				return results;
			}
		}
		
		return filterDescriptions;
		
//		IResourceFilterDescription[] results = null;
//		checkValidPath(path, FOLDER | PROJECT, true);
//		Project project = (Project) getProject();
//		ProjectDescription desc = project.internalGetDescription();
//		if (desc != null) {
//			LinkedList/*<FilterDescription>*/ list = desc.getFilter(getProjectRelativePath());
//			if (list != null) {
//				results = new IResourceFilterDescription[list.size()];
//				for (int i = 0; i < list.size(); i++) {
//					results[i] = (FilterDescription) list.get(i);
//				}
//				return results;
//			}
//		}
//		return new IResourceFilterDescription[0];
	}

	/* (non-Javadoc)

			}
		}

//		List filters = findFilters();
//		if ((filters != null) && (filters.size() > 0)) {
//			// delete resource filters
//			Project project = (Project) getProject();
//			ProjectDescription description = project.internalGetDescription();
//			if (description != null) {
//				for (Iterator it = filters.iterator(); it.hasNext();)
//					description.setFilters(((IResource) it.next()).getProjectRelativePath(), null);
//				project.internalSetDescription(description, true);
//				project.writeDescription(IResource.FORCE);
//			}
//		}
		
		// Delete properties after the resource is deleted from the tree. See bug 84584.
		CoreException err = null;

	 * Returns a list of all filtered resources at or below this resource, or null if there
	 * are no links.
	 */
//	private List findFilters() {
//		Project project = (Project) getProject();
//		ProjectDescription description = project.internalGetDescription();
//		List filters = null;
//		if (description != null) {
//			HashMap filterMap = description.getFilters();
//			if (filterMap != null) {
//				IPath myPath = getProjectRelativePath();
//				for (Iterator it = filterMap.keySet().iterator(); it.hasNext();) {
//					IPath filterPath = (IPath) it.next();
//					if (myPath.isPrefixOf(filterPath)) {
//						if (filters == null)
//							filters = new ArrayList();
//						filters.add(workspace.newResource(project.getFullPath().append(filterPath), IResource.FOLDER));
//					}
//				}
//			}
//		}
//		return filters;
//	}

	/* (non-Javadoc)
	 * @see IResource#equals(Object)

				project.writeDescription(IResource.NONE);
		}

//		List filters = findFilters();
//		if ((filters != null) && (filters.size() > 0)) {
//			// delete resource filters
//			Project project = (Project) getProject();
//			ProjectDescription description = project.internalGetDescription();
//			for (Iterator it = filters.iterator(); it.hasNext();)
//				description.setFilters(((IResource) it.next()).getProjectRelativePath(), null);
//			project.writeDescription(IResource.NONE);
//		}

		// check if we deleted a preferences file 
		ProjectPreferences.deleted(this);

		ProjectDescription desc = ((Project) project).internalGetDescription();
		if (desc == null)
			return false;
		LinkedList filters;
		try {
			filters = new LinkedList(Arrays.asList(getFilters())) /*desc.getFilter(getProjectRelativePath())*/;
			if ((filters != null) && (filters.size() > 0))
				return true;
		} catch (CoreException e) {
			// TODO Auto-generated catch block
			e.printStackTrace();
		}
		
		return false;
	}


			LinkedList/*<Filter>*/currentExcludeFilters = new LinkedList/*<FilterDescription>*/();
			LinkedList/*<FilterDescription>*/filters = null;
			if (project.internalGetDescription() != null) {
				try {
					filters = new LinkedList(Arrays.asList(getFilters()));
				} catch (CoreException e) {
					// TODO Auto-generated catch block
					e.printStackTrace();
				}
				
				if (filters != null) {
					Iterator/*FilterDescription*/it = filters.iterator();
					while (it.hasNext()) {

				// verify inherited filters
				while (relativePath.segmentCount() > 0) {
					relativePath = relativePath.removeLastSegments(1);
					try {
						filters = new LinkedList(Arrays.asList(getFilters()));
					} catch (CoreException e) {
						// TODO Auto-generated catch block
						e.printStackTrace();
					}
					if (filters != null) {
						Iterator/*FilterDescription*/it = filters.iterator();
						while (it.hasNext()) {

Lines 695-701 Link Here

(-)src/org/eclipse/core/internal/resources/ResourceTree.java (-1 / +1 lines)
695	//moving linked resources may have modified the description in memory	695	//moving linked resources may have modified the description in memory
696	((ProjectDescription) destDescription).setLinkDescriptions(destination.internalGetDescription().getLinks());	696	((ProjectDescription) destDescription).setLinkDescriptions(destination.internalGetDescription().getLinks());
697	// moving filters may have modified the description in memory	697	// moving filters may have modified the description in memory
698	((ProjectDescription) destDescription).setFilterDescriptions(destination.internalGetDescription().getFilters());	698	// ((ProjectDescription) destDescription).setFilterDescriptions(destination.internalGetDescription().getFilters());
699	// moving variables may have modified the description in memory	699	// moving variables may have modified the description in memory
700	((ProjectDescription) destDescription).setVariableDescriptions(destination.internalGetDescription().getVariables());	700	((ProjectDescription) destDescription).setVariableDescriptions(destination.internalGetDescription().getVariables());
701	destination.internalSetDescription(destDescription, true);	701	destination.internalSetDescription(destDescription, true);




		}

		// update filters in project descriptions
//		if (source.hasFilters() && source.getProject().exists()) {
//			Project sourceProject = (Project) source.getProject();
//			LinkedList/*<FilterDescription>*/ originalDescriptions = sourceProject.internalGetDescription().getFilter(source.getProjectRelativePath());
//			LinkedList/*<FilterDescription>*/ filterDescriptions = FilterDescription.copy(originalDescriptions, destinationResource);
//			if (moveResources && !movingProject) {
//				if (((Project) source.getProject())
//						.internalGetDescription()
//						.setFilters(source.getProjectRelativePath(), null))
//					((Project) source.getProject()).writeDescription(updateFlags);
//			}
//			Project project = (Project) destinationResource.getProject();
//			project.internalGetDescription().setFilters(destinationResource.getProjectRelativePath(), filterDescriptions);
//			project.writeDescription(updateFlags);
//		}

		// do the recursion. if we have a file then it has no members so return. otherwise
		// recursively call this method on the container's members if the depth tells us to

Return to bug 298100

Lines 211-214 Link Here

(-)plugin.xml (+17 lines)
211	</run>	211	</run>
212	</filesystem>	212	</filesystem>
213	</extension>	213	</extension>
		214	<extension
		215	id="filtermarker"
		216	name="Filter Marker"
		217	point="org.eclipse.core.resources.markers">
		218	<super
		219	type="org.eclipse.core.resources.marker">
		220	</super>
		221	<persistent
		222	value="false">
		223	</persistent>
		224	<attribute
		225	name="type">
		226	</attribute>
		227	<attribute
		228	name="matcherDescription">
		229	</attribute>
		230	</extension>
214	</plugin>	231	</plugin>

Lines 12-19 Link Here

(-)src/org/eclipse/core/internal/resources/FilterTypeManager.java (-2 / +19 lines)
12	package org.eclipse.core.internal.resources;	12	package org.eclipse.core.internal.resources;
13		13
14	import java.util.HashMap;	14	import java.util.HashMap;
15	import org.eclipse.core.resources.IFilterMatcherDescriptor;	15	import org.eclipse.core.resources.*;
16	import org.eclipse.core.resources.ResourcesPlugin;
17	import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;	16	import org.eclipse.core.resources.filtermatchers.AbstractFileInfoMatcher;
18	import org.eclipse.core.runtime.*;	17	import org.eclipse.core.runtime.*;
19		18
Lines 102-106 Link Here
102		101
103	public void startup(IProgressMonitor monitor) {	102	public void startup(IProgressMonitor monitor) {
104	//nothing to do	103	//nothing to do
		104
		105	// ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
		106	// public void resourceChanged(IResourceChangeEvent event) {
		107	// IMarkerDelta[] mDelta = event.getDelta().getMarkerDeltas();
		108	// if (mDelta.length != 0) {
		109	// if (mDelta[0].getKind() == IResourceDelta.ADDED) {
		110	// try {
		111	// ((ProjectDescription) mDelta[0].getResource().getProject().getDescription()).addFilterDescription(new FilterDescription(mDelta[0].getResource(), ((Integer) mDelta[0].getAttribute("type")).intValue(), //$NON-NLS-1$
		112	// (FileInfoMatcherDescription) mDelta[0].getAttribute("matcherDescription"))); //$NON-NLS-1$
		113	// ((Project)mDelta[0].getResource().getProject()).writeDescription(IResource.NONE);
		114	// } catch (CoreException e) {
		115	// // TODO Auto-generated catch block
		116	// e.printStackTrace();
		117	// }
		118	// }
		119	// }
		120	// }
		121	// }, IResourceChangeEvent.POST_CHANGE);
105	}	122	}
106	}	123	}

Lines 219-234 Link Here

(-)src/org/eclipse/core/internal/resources/ModelObjectWriter.java (-10 / +11 lines)
219	Collections.sort(sorted);	219	Collections.sort(sorted);
220	write(LINKED_RESOURCES, sorted, writer);	220	write(LINKED_RESOURCES, sorted, writer);
221	}	221	}
222	HashMap filters = description.getFilters();	222
223	if (filters != null) {	223	// HashMap filters = description.getFilters();
224	List sorted = new ArrayList();	224	// if (filters != null) {
225	for (Iterator it = filters.values().iterator(); it.hasNext();) {	225	// List sorted = new ArrayList();
226	List list = (List) it.next();	226	// for (Iterator it = filters.values().iterator(); it.hasNext();) {
227	sorted.addAll(list);	227	// List list = (List) it.next();
228	}	228	// sorted.addAll(list);
229	Collections.sort(sorted);	229	// }
230	write(FILTERED_RESOURCES, sorted, writer);	230	// Collections.sort(sorted);
231	}	231	// write(FILTERED_RESOURCES, sorted, writer);
		232	// }
232	HashMap variables = description.getVariables();	233	HashMap variables = description.getVariables();
233	if (variables != null) {	234	if (variables != null) {
234	List sorted = new ArrayList(variables.values());	235	List sorted = new ArrayList(variables.values());

Lines 181-191 Link Here

(-)src/org/eclipse/core/internal/resources/ProjectDescription.java (-35 / +45 lines)
181	* Returns the filter for the given resource name. Returns null if	181	* Returns the filter for the given resource name. Returns null if
182	* no such filter exists.	182	* no such filter exists.
183	*/	183	*/
184	synchronized public LinkedList/<FilterDescription>/ getFilter(IPath aPath) {	184	// synchronized public LinkedList/<FilterDescription>/ getFilter(IPath aPath) {
185	if (filterDescriptions == null)	185	// if (filterDescriptions == null)
186	return null;	186	// return null;
187	return (LinkedList /<FilterDescription> /) filterDescriptions.get(aPath);	187	// return (LinkedList /<FilterDescription> /) filterDescriptions.get(aPath);
188	}	188	// }
189		189
190	/**	190	/**
191	* Returns the map of link descriptions (IPath (project relative path) -> LinkDescription).	191	* Returns the map of link descriptions (IPath (project relative path) -> LinkDescription).
Lines 201-209 Link Here
201	* Since this method is only used internally, it never creates a copy.	201	* Since this method is only used internally, it never creates a copy.
202	* Returns null if the project does not have any filtered resources.	202	* Returns null if the project does not have any filtered resources.
203	*/	203	*/
204	public HashMap getFilters() {	204	// public HashMap getFilters() {
205	return filterDescriptions;	205	// return filterDescriptions;
206	}	206	// }
207		207
208	/**	208	/**
209	* Returns the map of variable descriptions (String (variable name) ->	209	* Returns the map of variable descriptions (String (variable name) ->
Lines 300-310 Link Here
300	if (!Arrays.equals(natures, description.getNatureIds(false)))	300	if (!Arrays.equals(natures, description.getNatureIds(false)))
301	return true;	301	return true;
302		302
303	HashMap otherFilters = description.getFilters();	303	// HashMap otherFilters = description.getFilters();
304	if ((filterDescriptions == null) && (otherFilters != null))	304	// if ((filterDescriptions == null) && (otherFilters != null))
305	return otherFilters != null;	305	// return otherFilters != null;
306	if ((filterDescriptions != null) && !filterDescriptions.equals(otherFilters))	306	// if ((filterDescriptions != null) && !filterDescriptions.equals(otherFilters))
307	return true;	307	// return true;
308		308
309	HashMap otherVariables = description.getVariables();	309	HashMap otherVariables = description.getVariables();
310	if ((variableDescriptions == null) && (otherVariables != null))	310	if ((variableDescriptions == null) && (otherVariables != null))
Lines 431-465 Link Here
431	* Add the description of a filter. Setting to a description of null will	431	* Add the description of a filter. Setting to a description of null will
432	* remove the filter from the project description.	432	* remove the filter from the project description.
433	*/	433	*/
434	synchronized public void addFilter(IPath path, FilterDescription description) {	434	// synchronized public void addFilter(IPath path, FilterDescription description) {
435	Assert.isNotNull(description);	435	// Assert.isNotNull(description);
436	if (filterDescriptions == null)	436	// if (filterDescriptions == null)
437	filterDescriptions = new HashMap(10);	437	// filterDescriptions = new HashMap(10);
438	LinkedList/<FilterDescription>/ descList = (LinkedList /<FilterDescription> /) filterDescriptions.get(path);	438	// LinkedList/<FilterDescription>/ descList = (LinkedList /<FilterDescription> /) filterDescriptions.get(path);
439	if (descList == null) {	439	// if (descList == null) {
440	descList = new LinkedList/<FilterDescription>/();	440	// descList = new LinkedList/<FilterDescription>/();
441	filterDescriptions.put(path, descList);	441	// filterDescriptions.put(path, descList);
442	}	442	// }
		443	// descList.add(description);
		444	// }
		445
		446	LinkedList descList = new LinkedList();
		447
		448	public void addFilterDescription(FilterDescription description) {
443	descList.add(description);	449	descList.add(description);
444	}	450	}
445		451
		452	public void removeFilterDescription(FilterDescription description) {
		453	descList.remove(description);
		454	}
		455
446	/**	456	/**
447	* Add the description of a filter. Setting to a description of null will	457	* Add the description of a filter. Setting to a description of null will
448	* remove the filter from the project description.	458	* remove the filter from the project description.
449	*/	459	*/
450	synchronized public void removeFilter(IPath path, FilterDescription description) {	460	// synchronized public void removeFilter(IPath path, FilterDescription description) {
451	if (filterDescriptions != null) {	461	// if (filterDescriptions != null) {
452	LinkedList/<FilterDescription>/ descList = (LinkedList /<FilterDescription> /) filterDescriptions.get(path);	462	// LinkedList/<FilterDescription>/ descList = (LinkedList /<FilterDescription> /) filterDescriptions.get(path);
453	if (descList != null) {	463	// if (descList != null) {
454	descList.remove(description);	464	// descList.remove(description);
455	if (descList.size() == 0) {	465	// if (descList.size() == 0) {
456	filterDescriptions.remove(path);	466	// filterDescriptions.remove(path);
457	if (filterDescriptions.size() == 0)	467	// if (filterDescriptions.size() == 0)
458	filterDescriptions = null;	468	// filterDescriptions = null;
459	}	469	// }
460	}	470	// }
461	}	471	// }
462	}	472	// }
463		473
464	/**	474	/**
465	* Sets the description of a variable. Setting to a description of null will	475	* Sets the description of a variable. Setting to a description of null will

Lines 11-17 Link Here

(-)src/org/eclipse/core/internal/localstore/CopyVisitor.java (-9 / +8 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.core.internal.localstore;	12	package org.eclipse.core.internal.localstore;
13		13
14	import java.util.LinkedList;
15	import org.eclipse.core.filesystem.EFS;	14	import org.eclipse.core.filesystem.EFS;
16	import org.eclipse.core.filesystem.IFileStore;	15	import org.eclipse.core.filesystem.IFileStore;
17	import org.eclipse.core.internal.resources.*;	16	import org.eclipse.core.internal.resources.*;
Lines 81-94 Link Here
81	return false;	80	return false;
82	}	81	}
83	// update filters in project descriptions	82	// update filters in project descriptions
84	if (source.hasFilters()) {	83	// if (source.hasFilters()) {
85	Project sourceProject = (Project) source.getProject();	84	// Project sourceProject = (Project) source.getProject();
86	LinkedList/<FilterDescription>/originalDescriptions = sourceProject.internalGetDescription().getFilter(source.getProjectRelativePath());	85	// LinkedList/<FilterDescription>/originalDescriptions = sourceProject.internalGetDescription().getFilter(source.getProjectRelativePath());
87	LinkedList/<FilterDescription>/filterDescriptions = FilterDescription.copy(originalDescriptions, destination);	86	// LinkedList/<FilterDescription>/filterDescriptions = FilterDescription.copy(originalDescriptions, destination);
88	Project project = (Project) destination.getProject();	87	// Project project = (Project) destination.getProject();
89	project.internalGetDescription().setFilters(destination.getProjectRelativePath(), filterDescriptions);	88	// project.internalGetDescription().setFilters(destination.getProjectRelativePath(), filterDescriptions);
90	project.writeDescription(updateFlags);	89	// project.writeDescription(updateFlags);
91	}	90	// }
92		91
93	IFileStore sourceStore = node.getStore();	92	IFileStore sourceStore = node.getStore();
94	IFileStore destinationStore = destination.getStore();	93	IFileStore destinationStore = destination.getStore();