Changeset 1765 for branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.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.Manager/DirectExecutor.cs (modified) (6 diffs)

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -27 +27 @@
 using System.Threading;
 using System.IO;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
 
 using Eraser.Util;
 using Eraser.Util.ExtensionMethods;
-using System.Security.Principal;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Security.Permissions;
 
 namespace Eraser.Manager
@@ -152 +150 @@
         }
 
-        private void OnTaskEdited(object sender, TaskEventArgs e)
+        private void OnTaskEdited(object sender, EventArgs e)
         {
             //Find all schedule entries containing the task - since the user cannot make
             //edits to the task when it is queued (only if it is scheduled) remove
             //all task references and add them back
+            Task task = (Task)sender;
             lock (tasksLock)
                 for (int i = 0; i != scheduledTasks.Count; ++i)
@@ -162 +161 @@
                     {
                         Task currentTask = scheduledTasks.Values[i][j];
-                        if (currentTask == e.Task)
+                        if (currentTask == task)
                             scheduledTasks.Values[i].RemoveAt(j);
                         else
@@ -169 +168 @@
 
             //Then reschedule the task
-            if (e.Task.Schedule is RecurringSchedule)
-                ScheduleTask(e.Task);
+            if (task.Schedule is RecurringSchedule)
+                ScheduleTask(task);
         }
 
@@ -248 +247 @@
                         //Broadcast the task started event.
                         task.Canceled = false;
-                        task.OnTaskStarted(new TaskEventArgs(task));
-                        OnTaskProcessing(new TaskEventArgs(task));
+                        task.OnTaskStarted();
 
                         //Run the task
@@ -318 +316 @@
 
                         //And the task finished event.
-                        task.OnTaskFinished(new TaskEventArgs(task));
-                        OnTaskProcessed(new TaskEventArgs(task));
+                        task.OnTaskFinished();
 
                         //Remove the actively executing task from our instance variable