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

Timestamp:

02/08/10 06:44:59 (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/SchedulerPanel.cs (modified) (6 diffs)

branches/eraser6/CodeReview/Eraser/SchedulerPanel.cs

@@ -186 +186 @@
         /// </summary>
         /// <param name="e">The task event object.</param>
-        void task_TaskStarted(object sender, TaskEventArgs e)
+        void task_TaskStarted(object sender, EventArgs e)
         {
             if (InvokeRequired)
             {
-                Invoke((EventHandler<TaskEventArgs>)task_TaskStarted, sender, e);
+                Invoke((EventHandler)task_TaskStarted, sender, e);
                 return;
             }
 
             //Get the list view item
-            ListViewItem item = GetTaskItem(e.Task);
+            Task task = (Task)sender;
+            ListViewItem item = GetTaskItem(task);
 
             //Update the status.
@@ -228 +229 @@
         /// Handles the task completion event.
         /// </summary>
-        void task_TaskFinished(object sender, TaskEventArgs e)
+        void task_TaskFinished(object sender, EventArgs e)
         {
             if (InvokeRequired)
             {
-                Invoke((EventHandler<TaskEventArgs>)task_TaskFinished, sender, e);
+                Invoke((EventHandler)task_TaskFinished, sender, e);
                 return;
             }
 
             //Get the list view item
-            ListViewItem item = GetTaskItem(e.Task);
+            Task task = (Task)sender;
+            ListViewItem item = GetTaskItem(task);
             if (item == null)
                 return;
@@ -250 +252 @@
             //Get the exit status of the task.
             LogLevel highestLevel = LogLevel.Information;
-            LogEntryCollection logs = e.Task.Log.LastSessionEntries;
+            LogEntryCollection logs = task.Log.LastSessionEntries;
             foreach (LogEntry log in logs)
                 if (log.Level > highestLevel)
@@ -269 +271 @@
                 {
                     case LogLevel.Warning:
-                        message = S._("The task {0} has completed with warnings.", e.Task.UIText);
+                        message = S._("The task {0} has completed with warnings.", task.UIText);
                         icon = ToolTipIcon.Warning;
                         break;
                     case LogLevel.Error:
-                        message = S._("The task {0} has completed with errors.", e.Task.UIText);
+                        message = S._("The task {0} has completed with errors.", task.UIText);
                         icon = ToolTipIcon.Error;
                         break;
                     case LogLevel.Fatal:
-                        message = S._("The task {0} did not complete.", e.Task.UIText);
+                        message = S._("The task {0} did not complete.", task.UIText);
                         icon = ToolTipIcon.Error;
                         break;
                     default:
-                        message = S._("The task {0} has completed.", e.Task.UIText);
+                        message = S._("The task {0} has completed.", task.UIText);
                         icon = ToolTipIcon.Info;
                         break;
@@ -292 +294 @@
             //If the user requested us to remove completed one-time tasks, do so.
             if (EraserSettings.Get().ClearCompletedTasks &&
-                (e.Task.Schedule == Schedule.RunNow) && highestLevel < LogLevel.Warning)
-            {
-                Program.eraserClient.Tasks.Remove(e.Task);
+                (task.Schedule == Schedule.RunNow) && highestLevel < LogLevel.Warning)
+            {
+                Program.eraserClient.Tasks.Remove(task);
             }
 
@@ -319 +321 @@
                 //category since run-on-restart tasks will be changed to immediately
                 //run tasks.
-                CategorizeTask(e.Task, item);
+                CategorizeTask(task, item);
 
                 //Update the status of the task.