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

Timestamp:

4/28/2009 7:42:28 AM (4 years ago)

Author:

lowjoel

Message:

Stylistic corrections: use internal set in properties instead of using interally-visible member variables

File:

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

branches/eraser6/Manager/DirectExecutor.cs

@@ -314 +314 @@
                             try
                             {
-                                progress.Event.currentTarget = target;
-                                ++progress.Event.currentTargetIndex;
+                                progress.Event.CurrentTarget = target;
+                                ++progress.Event.CurrentTargetIndex;
                                 if (target is Task.UnusedSpace)
                                     EraseUnusedSpace(task, (Task.UnusedSpace)target, progress);
@@ -525 +525 @@
         }
 
+        #region Unused Space erasure functions
         /// <summary>
         /// Executes a unused space erase.
@@ -560 +561 @@
             if (target.EraseClusterTips)
             {
-                progress.Event.currentItemName = S._("Cluster tips");
-                progress.Event.currentTargetTotalPasses = method.Passes;
-                progress.Event.timeLeft = progress.TimeLeft;
+                progress.Event.CurrentItemName = S._("Cluster tips");
+                progress.Event.CurrentTargetTotalPasses = method.Passes;
+                progress.Event.TimeLeft = progress.TimeLeft;
                 task.OnProgressChanged(progress.Event);
 
@@ -573 +574 @@
                         tipProgress.Completed = currentFile;
 
-                        progress.Event.currentItemName = S._("(Tips) {0}", currentFilePath);
-                        progress.Event.currentItemProgress = tipProgress.Progress;
+                        progress.Event.CurrentItemName = S._("(Tips) {0}", currentFilePath);
+                        progress.Event.CurrentItemProgress = tipProgress.Progress;
                         progress.Event.CurrentTargetProgress = progress.Event.CurrentItemProgress / 10;
-                        progress.Event.timeLeft = tipProgress.TimeLeft;
+                        progress.Event.TimeLeft = tipProgress.TimeLeft;
                         task.OnProgressChanged(progress.Event);
 
@@ -608 +609 @@
 
                 //Continue creating files while there is free space.
-                progress.Event.currentItemName = S._("Unused space");
+                progress.Event.CurrentItemName = S._("Unused space");
                 task.OnProgressChanged(progress.Event);
                 while (volInfo.AvailableFreeSpace > 0)
@@ -650 +651 @@
                             {
                                 progress.Completed += lastWritten;
-                                progress.Event.currentItemPass = currentPass;
-                                progress.Event.currentItemProgress = progress.Progress;
+                                progress.Event.CurrentItemPass = currentPass;
+                                progress.Event.CurrentItemProgress = progress.Progress;
                                 if (target.EraseClusterTips)
                                     progress.Event.CurrentTargetProgress = (float)
-                                        (0.1f + progress.Event.currentItemProgress * 0.8f);
+                                        (0.1f + progress.Event.CurrentItemProgress * 0.8f);
                                 else
                                     progress.Event.CurrentTargetProgress = (float)
-                                        (progress.Event.currentItemProgress * 0.9f);
-                                progress.Event.timeLeft = progress.TimeLeft;
+                                        (progress.Event.CurrentItemProgress * 0.9f);
+                                progress.Event.TimeLeft = progress.TimeLeft;
                                 task.OnProgressChanged(progress.Event);
 
@@ -670 +671 @@
 
                 //Erase old resident file system table files
-                progress.Event.currentItemName = S._("Old resident file system table files");
+                progress.Event.CurrentItemName = S._("Old resident file system table files");
                 task.OnProgressChanged(progress.Event);
                 EraseOldFilesystemResidentFiles(info, method, null);
@@ -677 +678 @@
             {
                 //Remove the folder holding all our temporary files.
-                progress.Event.currentItemName = S._("Removing temporary files");
+                progress.Event.CurrentItemName = S._("Removing temporary files");
                 task.OnProgressChanged(progress.Event);
                 RemoveFolder(info);
@@ -683 +684 @@
 
             //Then clean the old file system entries
-            progress.Event.currentItemName = S._("Old file system entries");
+            progress.Event.CurrentItemName = S._("Old file system entries");
             ProgressManager fsEntriesProgress = new ProgressManager();
             fsEntriesProgress.Start();
@@ -694 +695 @@
 
                     //Set the event parameters, then broadcast the progress event.
-                    progress.Event.timeLeft = fsEntriesProgress.TimeLeft;
-                    progress.Event.currentItemProgress = fsEntriesProgress.Progress;
+                    progress.Event.TimeLeft = fsEntriesProgress.TimeLeft;
+                    progress.Event.CurrentItemProgress = fsEntriesProgress.Progress;
                     progress.Event.CurrentTargetProgress = (float)(
                         0.9 + progress.Event.CurrentItemProgress / 10);
@@ -864 +865 @@
             }
         }
-
+        #endregion
+
+        #region Filesystem Object erasure functions
         /// <summary>
         /// The prototype of callbacks handling the file system table erase progress
@@ -1020 +1023 @@
                 //Update the task progress
                 progress.Event.CurrentTargetProgress = i / (float)paths.Count;
-                progress.Event.currentTarget = target;
-                progress.Event.currentItemName = paths[i];
-                progress.Event.currentItemProgress = 0;
-                progress.Event.currentTargetTotalPasses = method.Passes;
+                progress.Event.CurrentTarget = target;
+                progress.Event.CurrentItemName = paths[i];
+                progress.Event.CurrentItemProgress = 0;
+                progress.Event.CurrentTargetTotalPasses = method.Passes;
                 task.OnProgressChanged(progress.Event);
 
@@ -1068 +1071 @@
                                     dataTotal -= lastWritten;
                                     progress.Completed += lastWritten;
-                                    progress.Event.currentItemPass = currentPass;
-                                    progress.Event.currentItemProgress = (float)
+                                    progress.Event.CurrentItemPass = currentPass;
+                                    progress.Event.CurrentItemProgress = (float)
                                         ((itemWritten += lastWritten) / (float)itemTotal);
                                     progress.Event.CurrentTargetProgress =
-                                        (i + progress.Event.currentItemProgress) /
+                                        (i + progress.Event.CurrentItemProgress) /
                                         (float)paths.Count;
-                                    progress.Event.timeLeft = progress.TimeLeft;
+                                    progress.Event.TimeLeft = progress.TimeLeft;
                                     task.OnProgressChanged(progress.Event);
 
@@ -1143 +1146 @@
             return (info.Length + (clusterSize - 1)) & ~(clusterSize - 1);
         }
+        #endregion
 
         /// <summary>