Attachment 172736 Details for Bug 307566 – Patch

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

[patch] Patch

307566.patch (text/plain), 2.09 KB, created by Rakesh

on 2010-06-25 06:37:19 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rakesh

Created: 2010-06-25 06:37:19 EDT

Size: 2.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.sse.core
>Index: src-tasktags/org/eclipse/wst/sse/core/internal/tasks/WorkspaceTaskScanner.java
>===================================================================
>RCS file: /cvsroot/webtools/sourceediting/plugins/org.eclipse.wst.sse.core/src-tasktags/org/eclipse/wst/sse/core/internal/tasks/WorkspaceTaskScanner.java,v
>retrieving revision 1.19
>diff -u -r1.19 WorkspaceTaskScanner.java
>--- src-tasktags/org/eclipse/wst/sse/core/internal/tasks/WorkspaceTaskScanner.java	26 Feb 2010 22:35:12 -0000	1.19
>+++ src-tasktags/org/eclipse/wst/sse/core/internal/tasks/WorkspaceTaskScanner.java	25 Jun 2010 10:35:39 -0000
>@@ -365,7 +365,7 @@
> 		monitor.beginTask("", 8);//$NON-NLS-1$
> 		monitor.subTask(file.getFullPath().toString().substring(1));
> 
>-		List markerAttributes = null;
>+		List markerAttributes = new ArrayList();
> 		IContentType[] types = detectContentTypes(file);
> 		Set markerTypes = new HashSet(3);
> 		// Always included for safety and migration
>@@ -411,9 +411,6 @@
> 						 * 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());
> 							}
>@@ -437,9 +434,7 @@
> 		// 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);
>-			if (markerAttributes != null) {
>-				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);

Actions: View | Diff

Attachments on bug 307566: 172736