Changeset 1767 for branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs

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

File:

• branches/eraser6/CodeReview/Eraser.Manager/DirectExecutor.cs (modified) (2 diffs)

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));
+                }
             }