Changeset 1765 for branches/eraser6/CodeReview/Eraser/MainForm.cs

Timestamp:

2/8/2010 6:44:59 AM (2 years ago)

Author:

lowjoel

Message:

Removed the TaskProcessing? and TaskProcessed? events in Executor which duplicate the TaskStarted? and TaskFinished? events in Task. The TaskEventArgs? class can't disappear just yet as the TaskAdded? and TaskDeleted? events still need them (the sender is not the task, it's the executor) Addresses #275: Code Review

File:

• branches/eraser6/CodeReview/Eraser/MainForm.cs (modified) (3 diffs)

branches/eraser6/CodeReview/Eraser/MainForm.cs

@@ -54 +54 @@
             Theming.ApplyTheme(notificationMenu);
 
-            //Connect to the executor task processing and processed events.
-            Program.eraserClient.TaskProcessing += OnTaskProcessing;
-            Program.eraserClient.TaskProcessed += OnTaskProcessed;
+            //For every task we need to register the Task Started and Task Finished
+            //event handlers for progress notifications
+            foreach (Task task in Program.eraserClient.Tasks)
+                OnTaskAdded(this, new TaskEventArgs(task));
+            Program.eraserClient.TaskAdded += OnTaskAdded;
+            Program.eraserClient.TaskDeleted += OnTaskDeleted;
 
             //Check the notification area context menu's minimise to tray item.
@@ -305 +308 @@
 
         #region Task processing code (for notification area animation)
-        void OnTaskProcessing(object sender, TaskEventArgs e)
+        void OnTaskAdded(object sender, TaskEventArgs e)
+        {
+            e.Task.TaskStarted += OnTaskProcessing;
+            e.Task.TaskFinished += OnTaskProcessed;
+        }
+
+        void OnTaskDeleted(object sender, TaskEventArgs e)
+        {
+            e.Task.TaskStarted -= OnTaskProcessing;
+            e.Task.TaskFinished -= OnTaskProcessed;
+        }
+
+        void OnTaskProcessing(object sender, EventArgs e)
         {
             if (InvokeRequired)
             {
-                Invoke((EventHandler<TaskEventArgs>)OnTaskProcessing, sender, e);
+                Invoke((EventHandler)OnTaskProcessing, sender, e);
                 return;
             }
 
-            string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + e.Task.UIText;
+            Task task = (Task)sender;
+            string iconText = S._("Eraser") + " - " + S._("Processing:") + ' ' + task.UIText;
             if (iconText.Length >= 64)
                 iconText = iconText.Remove(60) + "...";
@@ -322 +338 @@
         }
 
-        void OnTaskProcessed(object sender, TaskEventArgs e)
+        void OnTaskProcessed(object sender, EventArgs e)
         {
             if (InvokeRequired)
             {
-                Invoke((EventHandler<TaskEventArgs>)OnTaskProcessed, sender, e);
+                Invoke((EventHandler)OnTaskProcessed, sender, e);
                 return;
             }