Attachment #172736 for bug #307566

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

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




		monitor.beginTask("", 8);//$NON-NLS-1$
		monitor.subTask(file.getFullPath().toString().substring(1));

		List markerAttributes = new ArrayList();
		IContentType[] types = detectContentTypes(file);
		Set markerTypes = new HashSet(3);
		// Always included for safety and migration

						 * operation creating them
						 */
						for (int i = 0; i < taskMarkerAttributes.length; i++) {
							if (markerAttributes == null) {
								markerAttributes = new ArrayList();
							}
							if (!taskMarkerAttributes[i].containsKey(IMarker.TASK)) {
								taskMarkerAttributes[i].put(IMarker.TASK, fileScanners[j].getMarkerType());
							}

		// only update markers if we ran a scanner on this file
		if (fileScanners != null && fileScanners.length > 0) {
			IProgressMonitor markerUpdateMonitor = new SubProgressMonitor(monitor, 3, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
			replaceTaskMarkers(file, (String[]) markerTypes.toArray(new String[markerTypes.size()]), (Map[]) markerAttributes.toArray(new Map[markerAttributes.size()]), markerUpdateMonitor);
				replaceTaskMarkers(file, (String[]) markerTypes.toArray(new String[markerTypes.size()]), (Map[]) markerAttributes.toArray(new Map[markerAttributes.size()]), markerUpdateMonitor);
			}
		}
		else {
			monitor.worked(3);

Return to bug 307566

Lines 365-371 Link Here

(-)src-tasktags/org/eclipse/wst/sse/core/internal/tasks/WorkspaceTaskScanner.java (-7 / +2 lines)
365	monitor.beginTask("", 8);//$NON-NLS-1$	365	monitor.beginTask("", 8);//$NON-NLS-1$
366	monitor.subTask(file.getFullPath().toString().substring(1));	366	monitor.subTask(file.getFullPath().toString().substring(1));
367		367
368	List markerAttributes = null;	368	List markerAttributes = new ArrayList();
369	IContentType[] types = detectContentTypes(file);	369	IContentType[] types = detectContentTypes(file);
370	Set markerTypes = new HashSet(3);	370	Set markerTypes = new HashSet(3);
371	// Always included for safety and migration	371	// Always included for safety and migration
Lines 411-419 Link Here
411	* operation creating them	411	* operation creating them
412	*/	412	*/
413	for (int i = 0; i < taskMarkerAttributes.length; i++) {	413	for (int i = 0; i < taskMarkerAttributes.length; i++) {
414	if (markerAttributes == null) {
415	markerAttributes = new ArrayList();
416	}
417	if (!taskMarkerAttributes[i].containsKey(IMarker.TASK)) {	414	if (!taskMarkerAttributes[i].containsKey(IMarker.TASK)) {
418	taskMarkerAttributes[i].put(IMarker.TASK, fileScanners[j].getMarkerType());	415	taskMarkerAttributes[i].put(IMarker.TASK, fileScanners[j].getMarkerType());
419	}	416	}
Lines 437-445 Link Here
437	// only update markers if we ran a scanner on this file	434	// only update markers if we ran a scanner on this file
438	if (fileScanners != null && fileScanners.length > 0) {	435	if (fileScanners != null && fileScanners.length > 0) {
439	IProgressMonitor markerUpdateMonitor = new SubProgressMonitor(monitor, 3, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);	436	IProgressMonitor markerUpdateMonitor = new SubProgressMonitor(monitor, 3, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK);
440	if (markerAttributes != null) {	437	replaceTaskMarkers(file, (String[]) markerTypes.toArray(new String[markerTypes.size()]), (Map[]) markerAttributes.toArray(new Map[markerAttributes.size()]), markerUpdateMonitor);
441	replaceTaskMarkers(file, (String[]) markerTypes.toArray(new String[markerTypes.size()]), (Map[]) markerAttributes.toArray(new Map[markerAttributes.size()]), markerUpdateMonitor);
442	}
443	}	438	}
444	else {	439	else {
445	monitor.worked(3);	440	monitor.worked(3);