Changeset 1196


Ignore:
Timestamp:
9/28/2009 7:22:58 AM (4 years ago)
Author:
lowjoel
Message:

Fixed FxCop? warning 1034 and 1725, don't nest public types and overrides should match base declaration.

Location:
trunk/eraser6/Eraser.Manager
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/eraser6/Eraser.Manager/DirectExecutor.cs

    r1193 r1196  
    530530 
    531531                //Define the callback handlers 
    532                 FileSystem.ClusterTipsSearchProgress searchProgress = delegate(string path) 
     532                ClusterTipsSearchProgress searchProgress = delegate(string path) 
    533533                    { 
    534534                        progress.Event.CurrentItemName = path; 
    … …  
    539539                    }; 
    540540 
    541                 FileSystem.ClusterTipsEraseProgress eraseProgress = 
     541                ClusterTipsEraseProgress eraseProgress = 
    542542                    delegate(int currentFile, int totalFiles, string currentFilePath) 
    543543                    { 

  • trunk/eraser6/Eraser.Manager/FileSystem.cs

    r1195 r1196  
    213213 
    214214        /// <summary> 
    215         /// The function prototype for cluster tip search progress callbacks. This is 
    216         /// called when the cluster tips are being searched. 
    217         /// </summary> 
    218         /// <param name="currentPath">The directory being searched</param> 
    219         public delegate void ClusterTipsSearchProgress(string currentPath); 
    220  
    221         /// <summary> 
    222         /// The function prototype for cluster tip erasure callbacks. This is called when 
    223         /// the cluster tips are being erased. 
    224         /// </summary> 
    225         /// <param name="currentFile">The current file index being erased.</param> 
    226         /// <param name="totalFiles">The total number of files to be erased.</param> 
    227         /// <param name="currentFilePath">The path to the current file being erased.</param> 
    228         public delegate void ClusterTipsEraseProgress(int currentFile, int totalFiles, 
    229             string currentFilePath); 
    230  
    231         /// <summary> 
    232215        /// Erases all file cluster tips in the given volume. 
    233216        /// </summary> 
    234217        /// <param name="info">The volume to search for file cluster tips and erase them.</param> 
    235218        /// <param name="method">The erasure method being employed.</param> 
    236         /// <param name="logger">The log manager instance that tracks log messages.</param> 
     219        /// <param name="log">The log manager instance that tracks log messages.</param> 
    237220        /// <param name="searchCallback">The callback function for search progress.</param> 
    238221        /// <param name="eraseCallback">The callback function for erasure progress.</param> 
    239222        public abstract void EraseClusterTips(VolumeInfo info, ErasureMethod method, 
    240             Logger logger, ClusterTipsSearchProgress searchCallback, 
     223            Logger log, ClusterTipsSearchProgress searchCallback, 
    241224            ClusterTipsEraseProgress eraseCallback); 
    242225 
    … …  
    275258        /// <param name="info"></param> 
    276259        public abstract void EraseFileSystemObject(StreamInfo info, ErasureMethod method, 
    277             EraserMethodProgressFunction callback); 
     260            ErasureMethodProgressFunction callback); 
    278261 
    279262        /// <summary> 
    … …  
    297280        public const int FileNameEraseTries = 50; 
    298281    } 
     282 
     283    /// <summary> 
     284    /// The function prototype for cluster tip search progress callbacks. This is 
     285    /// called when the cluster tips are being searched. 
     286    /// </summary> 
     287    /// <param name="currentPath">The directory being searched</param> 
     288    public delegate void ClusterTipsSearchProgress(string currentPath); 
     289 
     290    /// <summary> 
     291    /// The function prototype for cluster tip erasure callbacks. This is called when 
     292    /// the cluster tips are being erased. 
     293    /// </summary> 
     294    /// <param name="currentFile">The current file index being erased.</param> 
     295    /// <param name="totalFiles">The total number of files to be erased.</param> 
     296    /// <param name="currentFilePath">The path to the current file being erased.</param> 
     297    public delegate void ClusterTipsEraseProgress(int currentFile, int totalFiles, 
     298        string currentFilePath); 
    299299 
    300300    /// <summary> 
    … …  
    696696 
    697697        public override void EraseFileSystemObject(StreamInfo info, ErasureMethod method, 
    698             EraserMethodProgressFunction callback) 
     698            ErasureMethodProgressFunction callback) 
    699699        { 
    700700            //Check if the file fits in one MFT record 
    … …  
    767767 
    768768        public override void EraseFileSystemObject(StreamInfo info, ErasureMethod method, 
    769             EraserMethodProgressFunction callback) 
     769            ErasureMethodProgressFunction callback) 
    770770        { 
    771771            //Create the file stream, and call the erasure method to write to 
Note: See TracChangeset for help on using the changeset viewer.