Changeset 1484 for branches/eraser6/6.0

Timestamp:

1/7/2010 12:50:58 AM (3 years ago)

Author:

lowjoel

Message:

Supplements r1483 and r1477:
-Default to the Gutmann erasure method when the FL16KB method is used and no chained erasure method is applied
-Fixed exception when adding a new custom erasure method

Location:

branches/eraser6/6.0/Eraser.DefaultPlugins

Files:

• ErasureMethods/FirstLast16KB.cs (modified) (1 diff)
• SettingsForm.cs (modified) (3 diffs)

branches/eraser6/6.0/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs

@@ -46 +46 @@
                         ManagerLibrary.Settings.DefaultFileErasureMethod);
                 else
-                    method = ErasureMethodManager.GetInstance(
-                        new Guid("1407FC4E-FEFF-4375-B4FB-D7EFBB7E9922"));
+                    method = ErasureMethodManager.GetInstance(new Gutmann().Guid);
             }
             catch (ErasureMethodNotFoundException)

branches/eraser6/6.0/Eraser.DefaultPlugins/SettingsForm.cs

@@ -58 +58 @@
             if (fl16MethodCmb.SelectedIndex == -1)
             {
-                Guid defaultMethodGuid =
+                Guid methodGuid =
                     ManagerLibrary.Settings.DefaultFileErasureMethod;
+                if (methodGuid == new FirstLast16KB().Guid)
+                    methodGuid = new Gutmann().Guid;
+                
                 foreach (object item in fl16MethodCmb.Items)
-                    if (((ErasureMethod)item).Guid == defaultMethodGuid)
+                    if (((ErasureMethod)item).Guid == methodGuid)
                     {
                         fl16MethodCmb.SelectedItem = item;
@@ -70 +73 @@
             if (DefaultPlugin.Settings.EraseCustom != null)
             {
-                customMethods = DefaultPlugin.Settings.EraseCustom;
+                customMethods = new Dictionary<Guid,CustomErasureMethod>(
+                    DefaultPlugin.Settings.EraseCustom);
 
                 //Display the whole set on the list.
@@ -114 +118 @@
             {
                 CustomErasureMethod method = form.Method;
-                customMethods.Add(method.Guid, method);
                 addCustomMethods.Add(method);
                 AddMethod(method);