Attachment #210005 for bug #369587

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

Lines 106-112 Link Here

(-)vf2/org/eclipse/wst/validation/internal/MarkerManager.java (-1 / +5 lines)
106	*/	106	*/
107	public void deleteMarkers(IResource resource, long operationStartTime, int depth){	107	public void deleteMarkers(IResource resource, long operationStartTime, int depth){
108	try {	108	try {
109	hook(resource);	109	hook(resource);
		110
		111	if(!resource.exists())
		112	return;
		113
110	IMarker[] markers = resource.findMarkers(null, true, depth);	114	IMarker[] markers = resource.findMarkers(null, true, depth);
111	String markerType;	115	String markerType;
112	for (IMarker marker : markers){	116	for (IMarker marker : markers){

Lines 62-67 Link Here

(-)vf2/org/eclipse/wst/validation/internal/ValOperation.java (+27 lines)
62	*/	62	*/
63	private final Map<String, Set<IResource>> _validated = new HashMap<String, Set<IResource>>(20);	63	private final Map<String, Set<IResource>> _validated = new HashMap<String, Set<IResource>>(20);
64		64
		65	private final Set<IResource> _validatedProjects = new HashSet<IResource>(20);
		66
65	public ValOperation(){	67	public ValOperation(){
66	_multiProject = false;	68	_multiProject = false;
67	}	69	}
Lines 116-121 Link Here
116	}	118	}
117		119
118	/**	120	/**
		121	* Remember that this resource has been validated
		122	*
		123	* @param resource resource that has been validated.
		124	*/
		125
		126	public void addValidatedProject(IResource resource){
		127	synchronized(_validatedProjects){
		128	if (resource != null)
		129	_validatedProjects.add(resource);
		130	}
		131	}
		132
		133	/**
119	* Answer if this resource has already been validated as a side-effect of some other validation by the	134	* Answer if this resource has already been validated as a side-effect of some other validation by the
120	* given validator.	135	* given validator.
121	*	136	*
Lines 130-135 Link Here
130	return set.contains(resource);	145	return set.contains(resource);
131	}	146	}
132	}	147	}
		148
		149	/**
		150	* Answer if this resource has been validated
		151	*
		152	* @param resource
		153	*/
		154
		155	public boolean isValidatedProject(IResource resource){
		156	synchronized(_validatedProjects){
		157	return _validatedProjects.contains(resource);
		158	}
		159	}
133		160
134	/**	161	/**
135	* Has this validator been suspended for the duration of this operation on this project?	162	* Has this validator been suspended for the duration of this operation on this project?




			// Check for file ADDED and REMOVED events, which means that the file may have moved to a new
			// project. To be safe we clear it's cached list of validators.
			if (((kind & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) != 0)	&& resource.getType() == IResource.FILE) {
				ValManager.getDefault().clearValProperty(resource.getProject());
			}

			if ((kind & (IResourceDelta.ADDED | IResourceDelta.CHANGED)) != 0){
				ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build,
						_request.getBuildKind(), _operation, _subMonitor.newChild(1));
			}
			
			if ((kind & (IResourceDelta.REMOVED)) != 0){
				
				IResource project = resource.getProject();
				if (!_operation.isValidatedProject(project))
				{
					ValManager.getDefault().validate(_request.getProject(), project, IResourceDelta.REMOVED, ValType.Build,
						_request.getBuildKind(), _operation, _subMonitor.newChild(1));
					_operation.addValidatedProject(project);
				}				
			}
					
			IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();

					Validator val = dr.getValidator();
					if (Friend.shouldValidate(val, dr.getResource(), ValType.Build, new ContentTypeWrapper())){
						_operation.getState().put(ValidationState.TriggerResource, resource);
						ValidationEvent event = new ValidationEvent(dr.getResource(), delta.getKind(), delta);
						if (val.shouldClearMarkers(event))mm.clearMarker(dr.getResource(), val);
							ValManager.getDefault().validate(val, _operation, dr.getResource(),
									delta.getKind(), _monitor, event);
						}
					}
				}
			}
					
			return true;
		}

		
	}

}

Return to bug 369587

Lines 320-331 Link Here

(-)vf2/org/eclipse/wst/validation/internal/ValBuilderJob.java (-12 / +19 lines)
320	// Check for file ADDED and REMOVED events, which means that the file may have moved to a new	320	// Check for file ADDED and REMOVED events, which means that the file may have moved to a new
321	// project. To be safe we clear it's cached list of validators.	321	// project. To be safe we clear it's cached list of validators.
322	if (((kind & (IResourceDelta.ADDED \| IResourceDelta.REMOVED)) != 0) && resource.getType() == IResource.FILE) {	322	if (((kind & (IResourceDelta.ADDED \| IResourceDelta.REMOVED)) != 0) && resource.getType() == IResource.FILE) {
323	ValManager.getDefault().clearValProperty(resource);	323	ValManager.getDefault().clearValProperty(resource.getProject());
324	}	324	}
325		325
326	if ((kind & (IResourceDelta.ADDED \| IResourceDelta.CHANGED)) != 0){	326	if ((kind & (IResourceDelta.ADDED \| IResourceDelta.CHANGED)) != 0){
327	ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build,	327	ValManager.getDefault().validate(_request.getProject(), resource, delta.getKind(), ValType.Build,
328	_request.getBuildKind(), _operation, _subMonitor.newChild(1));	328	_request.getBuildKind(), _operation, _subMonitor.newChild(1));
		329	}
		330
		331	if ((kind & (IResourceDelta.REMOVED)) != 0){
		332
		333	IResource project = resource.getProject();
		334	if (!_operation.isValidatedProject(project))
		335	{
		336	ValManager.getDefault().validate(_request.getProject(), project, IResourceDelta.REMOVED, ValType.Build,
		337	_request.getBuildKind(), _operation, _subMonitor.newChild(1));
		338	_operation.addValidatedProject(project);
		339	}
329	}	340	}
330		341
331	IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();	342	IDependencyIndex index = ValidationFramework.getDefault().getDependencyIndex();
Lines 335-352 Link Here
335	Validator val = dr.getValidator();	346	Validator val = dr.getValidator();
336	if (Friend.shouldValidate(val, dr.getResource(), ValType.Build, new ContentTypeWrapper())){	347	if (Friend.shouldValidate(val, dr.getResource(), ValType.Build, new ContentTypeWrapper())){
337	_operation.getState().put(ValidationState.TriggerResource, resource);	348	_operation.getState().put(ValidationState.TriggerResource, resource);
338	ValidationEvent event = new ValidationEvent(dr.getResource(), IResourceDelta.NO_CHANGE, delta);	349	ValidationEvent event = new ValidationEvent(dr.getResource(), delta.getKind(), delta);
339	if (val.shouldClearMarkers(event))mm.clearMarker(dr.getResource(), val);	350	if (val.shouldClearMarkers(event))mm.clearMarker(dr.getResource(), val);
340	ValManager.getDefault().validate(val, _operation, dr.getResource(),	351	ValManager.getDefault().validate(val, _operation, dr.getResource(),
341	IResourceDelta.NO_CHANGE, _monitor, event);	352	delta.getKind(), _monitor, event);
		353	}
342	}	354	}
343	}	355	}
344	}
345
346	return true;	356	return true;
347	}	357	}
348
349
350	}	358	}
351
352	}	359	}