Changeset 1563

Timestamp:

1/18/2010 6:16:16 AM (3 years ago)

Author:

lowjoel

Message:

Replaced the ShellApi? class with the RecycleBin? class (since ShEmptyRecycleBin? was the only remaining member of the class) Addresses #284: Eraser.Util rewrite

Location:

branches/eraser6/CodeReview

Files:

• Eraser.Manager/DirectExecutor.cs (modified) (1 diff)
• Eraser.Util/Eraser.Util.csproj (modified) (2 diffs)
• Eraser.Util/RecycleBin.cs (moved) (moved from branches/eraser6/CodeReview/Eraser.Util/ShellApi.cs) (2 diffs)

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

@@ -708 +708 @@
                         new TaskProgressChangedEventArgs(string.Empty, 0, 0)));
 
-                ShellApi.EmptyRecycleBin(EmptyRecycleBinOptions.NoConfirmation |
+                RecycleBin.EmptyRecycleBin(EmptyRecycleBinOptions.NoConfirmation |
                     EmptyRecycleBinOptions.NoProgressUI | EmptyRecycleBinOptions.NoSound);
             }

branches/eraser6/CodeReview/Eraser.Util/Eraser.Util.csproj

@@ -62 +62 @@
     <Compile Include="NativeMethods\WinTrust.cs" />
     <Compile Include="NtfsApi.cs" />
-    <Compile Include="ShellApi.cs" />
+    <Compile Include="RecycleBin.cs" />
     <Compile Include="SystemRestoreApi.cs">
       <SubType>Component</SubType>
@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Power.cs" />
     <Compile Include="NativeMethods\Gdi.cs" />
     <Compile Include="NativeMethods\Sfc.cs" />

branches/eraser6/CodeReview/Eraser.Util/RecycleBin.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Text;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
 
 namespace Eraser.Util
 {
-    public static class ShellApi
+    public static class RecycleBin
     {
         /// <summary>
@@ -35 +33 @@
         /// <param name="options">The list of flags to pass to the shell regarding
         /// the user feedback, etc.</param>
-        public static void EmptyRecycleBin(EmptyRecycleBinOptions options)
+        public static void Empty(EmptyRecycleBinOptions options)
         {
             NativeMethods.SHEmptyRecycleBin(IntPtr.Zero, null,