1 files changed, 16 insertions, 22 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
index 75ab2adfe4..8e24e95f31 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
@@ -39,7 +39,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 {
 	
 	
-	public class MultiTaskDialogProgressMonitor : BaseProgressMonitor 
+	public class MultiTaskDialogProgressMonitor : ProgressMonitor 
 	{
 		StringCollection errorsMessages = new StringCollection ();
 		StringCollection warningMessages = new StringCollection ();
@@ -75,7 +75,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 				};
 				MessageService.PlaceDialog (dialog, parent);
 				Mono.TextEditor.GtkWorkarounds.PresentWindowWithNotification (dialog);
-				dialog.AsyncOperation = AsyncOperation;
+				dialog.CancellationTokenSource = CancellationTokenSource;
 				DispatchService.RunPendingEvents ();
 				this.showDetails = showDetails;
 			}
@@ -106,46 +106,39 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 		protected override void OnProgressChanged ()
 		{
 			if (dialog != null) {
-				dialog.SetProgress (CurrentTaskWork);
+				dialog.SetProgress (Progress);
 				DispatchService.RunPendingEvents ();
 			}
 		}
 		
-		public override void BeginTask (string name, int totalWork)
+		protected override void OnBeginTask (string name, int totalWork, int stepWork)
 		{
 			if (dialog != null) {
 				dialog.BeginTask (name);
 			}
-			base.BeginTask (name, totalWork);
+			base.OnBeginTask (name, totalWork, stepWork);
 		}
-		
-		public override void BeginStepTask (string name, int totalWork, int stepSize)
-		{
-			if (dialog != null) {
-				dialog.BeginTask (name);
-			}
-			base.BeginStepTask (name, totalWork, stepSize);
-		}
-		
-		public override void EndTask ()
+
+		protected override void OnEndTask (string name, int totalWork, int stepWork)
 		{
 			if (dialog != null) {
 				dialog.EndTask ();
 			}
-			base.EndTask ();
 			DispatchService.RunPendingEvents ();
+			base.OnEndTask (name, totalWork, stepWork);
 		}
-						
-		public override void ReportWarning (string message)
+
+		protected override void OnWarningReported (string message)
 		{
 			if (dialog != null) {
 				dialog.WriteText (GettextCatalog.GetString ("WARNING: ") + message + "\n");
 				DispatchService.RunPendingEvents ();
 			}
 			warningMessages.Add (message);
+			base.OnWarningReported (message);
 		}
-		
-		public override void ReportError (string message, Exception ex)
+
+		protected override void OnErrorReported (string message, Exception ex)
 		{
 			if (message == null && ex != null)
 				message = ex.Message;
@@ -153,17 +146,18 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 				if (!message.EndsWith (".")) message += ".";
 				message += " " + ex.Message;
 			}
-			
+
 			errorsMessages.Add (message);
 			if (ex != null) {
 				LoggingService.LogError (ex.ToString ());
 				errorException = ex;
 			}
-			
+
 			if (dialog != null) {
 				dialog.WriteText (GettextCatalog.GetString ("ERROR: ") + message + "\n");
 				DispatchService.RunPendingEvents ();
 			}
+			base.OnErrorReported (message, ex);
 		}
 		
 		protected override void OnCompleted ()