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

Timestamp:

3/15/2008 1:06:38 PM (5 years ago)

Author:

lowjoel

Message:

Replace the Globals static class with the ManagerLibrary? class which is a singleton-like class.

File:

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

branches/eraser6/Manager/DirectExecutor.cs

@@ -357 +357 @@
             if (method == ErasureMethodManager.Default)
                 method = ErasureMethodManager.GetInstance(
-                    Globals.Settings.DefaultUnusedSpaceErasureMethod);
+                    ManagerLibrary.Instance.Settings.DefaultUnusedSpaceErasureMethod);
 
             TaskProgressEventArgs eventArgs = new TaskProgressEventArgs(task, 0, 0);
@@ -419 +419 @@
                     //Then run the erase task
                     method.Erase(stream, long.MaxValue,
-                        PRNGManager.GetInstance(Globals.Settings.ActivePRNG),
+                        PRNGManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePRNG),
                         delegate(long lastWritten, int currentPass)
                         {
@@ -457 +457 @@
                         //Then run the erase task
                         method.Erase(strm, long.MaxValue,
-                            PRNGManager.GetInstance(Globals.Settings.ActivePRNG),
+                            PRNGManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePRNG),
                             null);
                     }
@@ -551 +551 @@
                     //Erase the file
                     method.Erase(stream, long.MaxValue, PRNGManager.GetInstance(
-                        Globals.Settings.ActivePRNG), null);
+                        ManagerLibrary.Instance.Settings.ActivePRNG), null);
                 }
                 finally
@@ -583 +583 @@
             ErasureMethod method = target.Method;
             if (method == ErasureMethodManager.Default)
-                method = ErasureMethodManager.GetInstance(Globals.Settings.DefaultFileErasureMethod);
+                method = ErasureMethodManager.GetInstance(ManagerLibrary.Instance.Settings.DefaultFileErasureMethod);
 
             //Calculate the total amount of data required to finish the wipe. This
@@ -634 +634 @@
                          itemTotal = method.CalculateEraseDataSize(null, strm.Length);
                     method.Erase(strm, long.MaxValue,
-                        PRNGManager.GetInstance(Globals.Settings.ActivePRNG),
+                        PRNGManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePRNG),
                         delegate(long lastWritten, int currentPass)
                         {
@@ -761 +761 @@
         {
             //Get a random file name
-            PRNG prng = PRNGManager.GetInstance(Globals.Settings.ActivePRNG);
+            PRNG prng = PRNGManager.GetInstance(ManagerLibrary.Instance.Settings.ActivePRNG);
             byte[] newFileNameAry = new byte[length];
             prng.NextBytes(newFileNameAry);