Attachment 32990 Details for Bug 118435 – proposed api

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

[patch] proposed api

proposed_api_118435.txt (text/plain), 3.26 KB, created by Benno Baumgartner

on 2006-01-13 11:26:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Benno Baumgartner

Created: 2006-01-13 11:26:04 EST

Size: 3.26 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.ide
>Index: src/org/eclipse/ui/views/markers/WorkbenchMarkerResolution.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/WorkbenchMarkerResolution.java,v
>retrieving revision 1.2
>diff -u -r1.2 WorkbenchMarkerResolution.java
>--- src/org/eclipse/ui/views/markers/WorkbenchMarkerResolution.java	6 Jan 2006 17:48:14 -0000	1.2
>+++ src/org/eclipse/ui/views/markers/WorkbenchMarkerResolution.java	13 Jan 2006 16:25:28 -0000
>@@ -12,6 +12,7 @@
> package org.eclipse.ui.views.markers;
> 
> import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.ui.IMarkerResolution2;
> 
> /**
>@@ -63,4 +64,17 @@
> 	public IMarker[] findOtherMarkers(IMarker[] markers){
> 		return new IMarker[0];
> 	}
>+
>+    /**
>+     * Runs this resolution. Resolve all <code>markers</code>.
>+     * <code>markers</code> must be a subset of the markers returned
>+     * by <code>findOtherMarkers(IMarker[])</code>
>+	 * <strong>NOTE:</strong> This method will become abstract for
>+	 * 3.2 M5.
>+	 * 
>+	 * @param markers The markers to resolve, not null
>+	 * @param monitor The monitor to report progress
>+	 */
>+	public void run(IMarker[] markers, IProgressMonitor monitor) {	
>+	}
> }
>Index: src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java,v
>retrieving revision 1.6
>diff -u -r1.6 MarkerResolutionDialog.java
>--- src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	6 Jan 2006 17:48:14 -0000	1.6
>+++ src/org/eclipse/ui/views/markers/internal/MarkerResolutionDialog.java	13 Jan 2006 16:25:28 -0000
>@@ -16,6 +16,7 @@
> import java.util.Hashtable;
> 
> import org.eclipse.core.resources.IMarker;
>+import org.eclipse.core.runtime.SubProgressMonitor;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.dialogs.IDialogConstants;
> import org.eclipse.jface.dialogs.TitleAreaDialog;
>@@ -543,22 +544,14 @@
> 		progressPart.beginTask(MarkerMessages.MarkerResolutionDialog_Fixing,
> 				checked.length + 1);
> 		progressPart.worked(1);
>+		
>+		calculatingResolutions= true;
> 
>-		for (int i = 0; i < checked.length; i++) {
>-			// Allow paint events and wake up the button
>-			getShell().getDisplay().readAndDispatch();
>-			if (progressCancelled()) {
>-				break;
>-			}
>-			IMarker marker = (IMarker) checked[i];
>-
>-			progressPart.subTask(Util.getProperty(IMarker.MESSAGE, marker));
>-
>-			resolution.run(marker);
>+		IMarker[] markers= new IMarker[checked.length];
>+		System.arraycopy(checked, 0, markers, 0, checked.length);
>+		((WorkbenchMarkerResolution)resolution).run(markers, new SubProgressMonitor(progressPart, checked.length));
> 
>-			progressPart.worked(1);
>-
>-		}
>+		calculatingResolutions= false;
> 		progressPart.done();
> 		progressCancelled = false;
> 		super.okPressed();
>@@ -572,6 +565,7 @@
> 	protected void cancelPressed() {
> 		if (calculatingResolutions) {
> 			progressCancelled = true;
>+			progressPart.setCanceled(true);
> 			return;
> 		}
> 		super.cancelPressed();

Actions: View | Diff

Attachments on bug 118435: 32990