Changeset 915 for branches/eraser6/Manager/DirectExecutor.cs

Timestamp:

4/28/2009 2:38:18 PM (4 years ago)

Author:

lowjoel

Message:

-Don't nest publicly accessible classes in classes.
-Camelcasing for abbreviations
-Abstract class constructors should be protected

File:

• branches/eraser6/Manager/DirectExecutor.cs (modified) (11 diffs)

branches/eraser6/Manager/DirectExecutor.cs

@@ -66 +66 @@
                 if (unusedIds.Count != 0)
                 {
-                    task.ID = unusedIds[0];
+                    task.Id = unusedIds[0];
                     unusedIds.RemoveAt(0);
                 }
                 else
-                    task.ID = ++nextId;
+                    task.Id = ++nextId;
             }
 
@@ -78 +78 @@
             //Add the task to the set of tasks
             lock (tasksLock)
-                tasks.Add(task.ID, task);
+                tasks.Add(task.Id, task);
 
             //Call all the event handlers who registered to be notified of tasks
@@ -111 +111 @@
 
                 for (int i = 0; i != scheduledTasks.Count; )
-                    if (scheduledTasks.Values[i].ID == taskId)
+                    if (scheduledTasks.Values[i].Id == taskId)
                         scheduledTasks.RemoveAt(i);
                     else
@@ -128 +128 @@
             {
                 //Replace the task in the global set
-                if (!tasks.ContainsKey(task.ID))
+                if (!tasks.ContainsKey(task.Id))
                     return;
 
-                tasks[task.ID] = task;
+                tasks[task.Id] = task;
 
                 //Then replace the task if it is in the queue
                 for (int i = 0; i != scheduledTasks.Count; ++i)
-                    if (scheduledTasks.Values[i].ID == task.ID)
+                    if (scheduledTasks.Values[i].Id == task.Id)
                     {
                         scheduledTasks.RemoveAt(i);
@@ -313 +313 @@
                         //Run the task
                         TaskProgressManager progress = new TaskProgressManager(currentTask);
-                        foreach (Task.ErasureTarget target in task.Targets)
+                        foreach (ErasureTarget target in task.Targets)
                             try
                             {
                                 progress.Event.CurrentTarget = target;
                                 ++progress.Event.CurrentTargetIndex;
-                                if (target is Task.UnusedSpace)
-                                    EraseUnusedSpace(task, (Task.UnusedSpace)target, progress);
-                                else if (target is Task.FilesystemObject)
-                                    EraseFilesystemObject(task, (Task.FilesystemObject)target, progress);
+                                if (target is UnusedSpaceTarget)
+                                    EraseUnusedSpace(task, (UnusedSpaceTarget)target, progress);
+                                else if (target is FileSystemObjectTarget)
+                                    EraseFilesystemObject(task, (FileSystemObjectTarget)target, progress);
                                 else
                                     throw new ArgumentException(S._("Unknown erasure target."));
@@ -501 +501 @@
             public TaskProgressManager(Task task)
             {
-                foreach (Task.ErasureTarget target in task.Targets)
+                foreach (ErasureTarget target in task.Targets)
                     Total += target.TotalData;
 
@@ -534 +534 @@
         /// <param name="target">The target of the unused space erase.</param>
         /// <param name="progress">The progress manager object managing the progress of the task</param>
-        private void EraseUnusedSpace(Task task, Task.UnusedSpace target, TaskProgressManager progress)
+        private void EraseUnusedSpace(Task task, UnusedSpaceTarget target, TaskProgressManager progress)
         {
             //Check for sufficient privileges to run the unused space erasure.
@@ -702 +702 @@
             string currentFilePath, int totalFiles);
 
-        private static void EraseClusterTips(Task task, Task.UnusedSpace target,
+        private static void EraseClusterTips(Task task, UnusedSpaceTarget target,
             ErasureMethod method, ClusterTipsEraseProgress callback)
         {
@@ -868 +868 @@
         /// <param name="target">The target of the erasure.</param>
         /// <param name="progress">The progress manager for the current task.</param>
-        private void EraseFilesystemObject(Task task, Task.FilesystemObject target,
+        private void EraseFilesystemObject(Task task, FileSystemObjectTarget target,
             TaskProgressManager progress)
         {
@@ -981 +981 @@
 
             //If the user requested a folder removal, do it.
-            if (target is Task.Folder)
+            if (target is FolderTarget)
             {
                 progress.Event.CurrentItemName = S._("Removing folders...");
                 task.OnProgressChanged(progress.Event);
 
-                Task.Folder fldr = (Task.Folder)target;
+                FolderTarget fldr = (FolderTarget)target;
                 if (fldr.DeleteIfEmpty)
                 {
@@ -995 +995 @@
 
             //If the user was erasing the recycle bin, clear the bin.
-            if (target is Task.RecycleBin)
+            if (target is RecycleBinTarget)
             {
                 progress.Event.CurrentItemName = S._("Emptying recycle bin...");