Changeset 1767

Timestamp:

2/8/2010 7:09:55 AM (2 years ago)

Author:

lowjoel

Message:

Do not localise exceptions which aren't meant to be seen by the user. User-visible exceptions will be dealt with in a separate ticket. Do not throw exceptions to indicate handleable errors (notably, when erasing unused space without administrator permissions) Addresses #275: Code Review

Location:

branches/eraser6/CodeReview

Files:

• Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs (modified) (1 diff)
• Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)
• Eraser.Manager/Method.cs (modified) (4 diffs)
• Eraser.Manager/PRNG.cs (modified) (1 diff)
• Eraser.Manager/Schedule.cs (modified) (4 diffs)
• Eraser.Manager/Task.cs (modified) (1 diff)

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

@@ -110 +110 @@
             //less.
             if (erasureLength != long.MaxValue)
-                throw new ArgumentException(S._("The amount of data erased should not be " +
-                    "limited, since this is a self-limiting erasure method."));
+                throw new ArgumentException("The amount of data erased should not be " +
+                    "limited, since this is a self-limiting erasure method.");
 
             //If the target stream is shorter than or equal to 32kb, just forward it to

branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

@@ -263 +263 @@
                                     EraseFilesystemObject(task, fileSystemObjectTarget);
                                 else
-                                    throw new ArgumentException(S._("Unknown erasure target."));
+                                    throw new ArgumentException("Unknown erasure target.");
                             }
                             catch (FatalException)
@@ -341 +341 @@
                     Environment.OSVersion.Version >= new Version(6, 0))
                 {
-                    throw new UnauthorizedAccessException(S._("The program does not have the " +
-                        "required permissions to erase the unused space on disk. Run the program " +
-                        "as an administrator and retry the operation."));
+                    task.Log.LastSessionEntries.Add(new LogEntry(S._("The program does not have " +
+                        "the required permissions to erase the unused space on disk. Run the " +
+                        "program as an administrator and retry the operation."), LogLevel.Error));
                 }
                 else
-                    throw new UnauthorizedAccessException(S._("The program does not have the " +
-                        "required permissions to erase the unused space on disk."));
+                {
+                    task.Log.LastSessionEntries.Add(new LogEntry(S._("The program does not have " +
+                        "the required permissions to erase the unused space on disk"),
+                        LogLevel.Error));
+                }
             }
 

branches/eraser6/CodeReview/Eraser.Manager/Method.cs

@@ -378 +378 @@
             public override long CalculateEraseDataSize(ICollection<string> paths, long targetSize)
             {
-                throw new InvalidOperationException(S._("The DefaultMethod class should never " +
-                    "be used and should instead be replaced before execution!"));
+                throw new InvalidOperationException("The DefaultMethod class should never " +
+                    "be used and should instead be replaced before execution!");
             }
 
@@ -385 +385 @@
                 ErasureMethodProgressFunction callback)
             {
-                throw new InvalidOperationException(S._("The DefaultMethod class should never " +
-                    "be used and should instead be replaced before execution!"));
+                throw new InvalidOperationException("The DefaultMethod class should never " +
+                    "be used and should instead be replaced before execution!");
             }
         }
@@ -473 +473 @@
             //Check for a valid constructor.
             if (ctor == null)
-                throw new ArgumentException(S._("Registered erasure methods must contain " +
+                throw new ArgumentException("Registered erasure methods must contain " +
                     "a parameterless constructor that is called whenever clients request " +
                     "for an instance of the method. If a constructor requires parameters, " +
-                    "specify it in the parameters parameter."));
+                    "specify it in the parameters parameter.");
 
             //Insert the entry
@@ -498 +498 @@
         {
             if (!ManagerLibrary.Instance.ErasureMethodManager.methods.ContainsKey(value))
-                throw new ArgumentException(S._("The GUID of the erasure method to remove " +
-                    "refers to an invalid erasure method."));
+                throw new ArgumentException("The GUID of the erasure method to remove " +
+                    "refers to an invalid erasure method.");
 
             ManagerLibrary.Instance.ErasureMethodManager.methods.Remove(value);

branches/eraser6/CodeReview/Eraser.Manager/PRNG.cs

@@ -104 +104 @@
             if (minValue > maxValue)
                 throw new ArgumentOutOfRangeException("minValue", minValue,
-                    S._("minValue is greater than maxValue"));
+                    "minValue is greater than maxValue");
             else if (minValue == maxValue)
                 return minValue;

branches/eraser6/CodeReview/Eraser.Manager/Schedule.cs

@@ -273 +273 @@
                 if (ScheduleType != RecurringScheduleUnit.Daily && ScheduleType != RecurringScheduleUnit.Weekly &&
                     ScheduleType != RecurringScheduleUnit.Monthly)
-                    throw new InvalidOperationException(S._("The ScheduleUnit of the schedule " +
-                        "does not require a frequency value, this field would contain garbage."));
+                    throw new InvalidOperationException("The ScheduleUnit of the schedule " +
+                        "does not require a frequency value, this field would contain garbage.");
 
                 return frequency;
@@ -314 +314 @@
             {
                 if (ScheduleType != RecurringScheduleUnit.Weekly)
-                    throw new InvalidOperationException(S._("The ScheduleUnit of the schedule " +
-                        "does not require the WeeklySchedule value, this field would contain garbage"));
+                    throw new InvalidOperationException("The ScheduleUnit of the schedule " +
+                        "does not require the WeeklySchedule value, this field would contain garbage");
 
                 return weeklySchedule;
@@ -340 +340 @@
             {
                 if (ScheduleType != RecurringScheduleUnit.Monthly)
-                    throw new InvalidOperationException(S._("The ScheduleUnit of the schedule does " +
-                        "not require the MonthlySchedule value, this field would contain garbage"));
+                    throw new InvalidOperationException("The ScheduleUnit of the schedule does " +
+                        "not require the MonthlySchedule value, this field would contain garbage");
 
                 return monthlySchedule;
@@ -470 +470 @@
         {
             if (ScheduleType != RecurringScheduleUnit.Weekly)
-                throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
-                    "not use the WeeklySchedule value, this field would contain garbage"));
+                throw new ArgumentException("The ScheduleUnit of the schedule does " +
+                    "not use the WeeklySchedule value, this field would contain garbage");
             return ((int)weeklySchedule & (1 << (int)date.DayOfWeek)) != 0;
         }

branches/eraser6/CodeReview/Eraser.Manager/Task.cs

@@ -183 +183 @@
             {
                 if (value.Owner != null)
-                    throw new ArgumentException(S._("The schedule provided can only " +
-                        "belong to one task at a time"));
+                    throw new ArgumentException("The schedule provided can only " +
+                        "belong to one task at a time");
 
                 if (schedule is RecurringSchedule)