Changeset 2368


Ignore:
Timestamp:
11/07/11 07:59:51 (3 years ago)
Author:
lowjoel
Message:

Replace the reference to Eraser.Manager with Eraser.Plugins. The majority of compile errors have been fixed already.

Location:
branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins
Files:
39 edited

Legend:

Unmodified
Added
Removed
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/CustomMethodEditorForm.cs

    r1802 r2368  
    2828using System.Windows.Forms; 
    2929using System.Globalization; 
    30 using Eraser.Manager; 
     30 
    3131using Eraser.Util; 
     32using Eraser.Plugins; 
     33using Eraser.Plugins.ExtensionPoints; 
    3234 
    3335namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/EntropySources/KernelEntropySource.cs

    r2055 r2368  
    1010using Microsoft.Win32.SafeHandles; 
    1111 
    12 using Eraser.Manager; 
    1312using Eraser.Util; 
     13using Eraser.Plugins.ExtensionPoints; 
    1414 
    1515namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Eraser.DefaultPlugins.csproj

    r2347 r2368  
    143143  </ItemGroup> 
    144144  <ItemGroup> 
    145     <ProjectReference Include="..\Eraser.Manager\Eraser.Manager.csproj"> 
    146       <Project>{C1AC3255-0939-499D-A69D-725E3DD4F574}</Project> 
    147       <Name>Eraser.Manager</Name> 
    148       <Private>False</Private> 
    149     </ProjectReference> 
    150145    <ProjectReference Include="..\Eraser.Plugins\Eraser.Plugins.csproj"> 
    151146      <Project>{59F7ED0F-3589-4112-B612-4A9A6588F4A0}</Project> 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/Custom.cs

    r1802 r2368  
    2727 
    2828using Eraser.Util; 
    29 using Eraser.Manager; 
     29using Eraser.Plugins; 
     30using Eraser.Plugins.ExtensionPoints; 
    3031 
    3132namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/DoD.cs

    r1802 r2368  
    2525using System.Runtime.InteropServices; 
    2626 
    27 using Eraser.Manager; 
    2827using Eraser.Util; 
     28using Eraser.Plugins; 
     29using Eraser.Plugins.ExtensionPoints; 
    2930 
    3031namespace Eraser.DefaultPlugins 
     
    5354            { 
    5455                //Set passes 1, 4 and 5 to be a random value 
    55                 Prng prng = ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng]; 
     56                Prng prng = Host.Instance.Prngs.ActivePrng; 
    5657                int rand = prng.Next(); 
    5758 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/FirstLast16KB.cs

    r2085 r2368  
    2525using System.Runtime.InteropServices; 
    2626 
    27 using Eraser.Manager; 
    28 using Eraser.Util; 
    2927using System.IO; 
    3028using System.Threading; 
    3129using System.Windows.Forms; 
     30 
     31using Eraser.Util; 
     32using Eraser.Plugins; 
     33using Eraser.Plugins.ExtensionPoints; 
    3234 
    3335namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/GOSTP50739.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/Gutmann.cs

    r2260 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/HMGIS5.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/RCMP_TSSIT_OPS_II.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
     
    5556            get 
    5657            { 
    57                 Prng prng = ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng]; 
     58                Prng prng = Host.Instance.Prngs.ActivePrng; 
    5859                int rand = prng.Next(); 
    5960 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/Random.cs

    r1802 r2368  
    2525using System.Runtime.InteropServices; 
    2626 
    27 using Eraser.Manager; 
    2827using Eraser.Util; 
     28using Eraser.Plugins; 
     29using Eraser.Plugins.ExtensionPoints; 
    2930 
    3031namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/Schneier.cs

    r1802 r2368  
    2525using System.Runtime.InteropServices; 
    2626 
    27 using Eraser.Manager; 
    2827using Eraser.Util; 
     28using Eraser.Plugins; 
     29using Eraser.Plugins.ExtensionPoints; 
    2930 
    3031namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/USAF5020.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
     
    5556            get 
    5657            { 
    57                 Prng prng = ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng]; 
     58                Prng prng = Host.Instance.Prngs.ActivePrng; 
    5859                int rand = prng.Next(); 
    5960 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/USArmyAR380_19.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureMethods/VSITR.cs

    r1802 r2368  
    2828using System.Runtime.InteropServices; 
    2929 
    30 using Eraser.Manager; 
    3130using Eraser.Util; 
     31using Eraser.Plugins; 
     32using Eraser.Plugins.ExtensionPoints; 
    3233 
    3334namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/DriveErasureTarget.cs

    r2197 r2368  
    2727using System.Security.Permissions; 
    2828using System.Runtime.Serialization; 
    29  
    30 using Eraser.Manager; 
     29using System.IO; 
     30 
    3131using Eraser.Util; 
    3232using Eraser.Util.ExtensionMethods; 
    33 using System.IO; 
     33using Eraser.Plugins; 
     34using Eraser.Plugins.ExtensionPoints; 
     35using Eraser.Plugins.Registrars; 
    3436 
    3537namespace Eraser.DefaultPlugins 
     
    115117                    return base.EffectiveMethod; 
    116118 
    117                 return ManagerLibrary.Instance.ErasureMethodRegistrar[ 
     119                return Host.Instance.ErasureMethods[ 
    118120                    ManagerLibrary.Settings.DefaultUnusedSpaceErasureMethod]; 
    119121            } 
     
    207209 
    208210                //Then run the erase task 
    209                 method.Erase(stream, long.MaxValue, 
    210                     ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng], 
     211                method.Erase(stream, long.MaxValue, Host.Instance.Prngs.ActivePrng, 
    211212                    delegate(long lastWritten, long totalData, int currentPass) 
    212213                    { 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/DriveErasureTargetConfigurer.cs

    r2232 r2368  
    3030using System.IO; 
    3131using System.Text.RegularExpressions; 
    32  
    33 using Eraser.Manager; 
     32using System.Globalization; 
     33 
    3434using Eraser.Util; 
    3535using Eraser.Util.ExtensionMethods; 
    36 using System.Globalization; 
     36using Eraser.Plugins; 
     37using Eraser.Plugins.ExtensionPoints; 
    3738 
    3839namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileErasureTarget.cs

    r2106 r2368  
    2929using System.IO; 
    3030 
    31 using Eraser.Manager; 
    3231using Eraser.Util; 
     32using Eraser.Plugins.ExtensionPoints; 
    3333 
    3434namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileErasureTargetConfigurer.cs

    r2237 r2368  
    3030 
    3131using System.Text.RegularExpressions; 
     32using System.IO; 
    3233 
    33 using Eraser.Manager; 
    3434using Eraser.Util; 
    35 using System.IO; 
     35using Eraser.Plugins; 
     36using Eraser.Plugins.ExtensionPoints; 
    3637 
    3738namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FileSystemObjectErasureTarget.cs

    r2360 r2368  
    3030using System.IO; 
    3131 
    32 using Eraser.Manager; 
    3332using Eraser.Util; 
    3433using Eraser.Util.ExtensionMethods; 
     34using Eraser.Plugins; 
     35using Eraser.Plugins.ExtensionPoints; 
     36using Eraser.Plugins.Registrars; 
    3537 
    3638namespace Eraser.DefaultPlugins 
     
    179181                    return base.EffectiveMethod; 
    180182 
    181                 return ManagerLibrary.Instance.ErasureMethodRegistrar[ 
     183                return Host.Instance.ErasureMethods[ 
    182184                    ManagerLibrary.Settings.DefaultFileErasureMethod]; 
    183185            } 
     
    239241 
    240242            //Get the filesystem provider to handle the secure file erasures 
    241             FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[ 
     243            FileSystem fsManager = Host.Instance.FileSystems[ 
    242244                VolumeInfo.FromMountPoint(info.DirectoryName)]; 
    243245 
     
    256258 
    257259                //Define the callback function for progress reporting. 
    258                 ErasureMethodProgressFunction callback = 
     260                ErasureMethod.ErasureMethodProgressFunction callback = 
    259261                    delegate(long lastWritten, long totalData, int currentPass) 
    260262                    { 
     
    302304        /// <param name="callback">The erasure progress callback.</param> 
    303305        private void TryEraseStream(FileSystem fsManager, ErasureMethod method, StreamInfo info, 
    304             ErasureMethodProgressFunction callback) 
     306            ErasureMethod.ErasureMethodProgressFunction callback) 
    305307        { 
    306308            for (int i = 0; ; ++i) 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTarget.cs

    r2222 r2368  
    3131using System.IO; 
    3232 
    33 using Eraser.Manager; 
    3433using Eraser.Util; 
     34using Eraser.Plugins; 
     35using Eraser.Plugins.ExtensionPoints; 
    3536 
    3637namespace Eraser.DefaultPlugins 
     
    199200                    directory.GetFiles("*", SearchOption.AllDirectories).Length == 0) 
    200201                { 
    201                     FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[ 
     202                    FileSystem fsManager = Host.Instance.FileSystems[ 
    202203                        VolumeInfo.FromMountPoint(Path)]; 
    203204                    fsManager.DeleteFolder(directory); 
     
    227228                try 
    228229                { 
    229                     ManagerLibrary.Instance.FileSystemRegistrar[ 
    230                         VolumeInfo.FromMountPoint(Path)].DeleteFolder(info); 
     230                    Host.Instance.FileSystems[VolumeInfo.FromMountPoint(Path)]. 
     231                        DeleteFolder(info); 
    231232                } 
    232233                catch (UnauthorizedAccessException) 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/FolderErasureTargetConfigurer.cs

    r2237 r2368  
    2929using System.Windows.Forms; 
    3030 
     31using System.IO; 
    3132using System.Text.RegularExpressions; 
    3233 
    33 using Eraser.Manager; 
    3434using Eraser.Util; 
    35 using System.IO; 
     35using Eraser.Plugins.ExtensionPoints; 
    3636 
    3737namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/RecycleBinErasureTarget.cs

    r2144 r2368  
    2929using System.IO; 
    3030 
    31 using Eraser.Manager; 
    3231using Eraser.Util; 
     32using Eraser.Plugins; 
     33using Eraser.Plugins.ExtensionPoints; 
    3334 
    3435namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/RecycleBinErasureTargetConfigurer.cs

    r2232 r2368  
    2626using System.Text.RegularExpressions; 
    2727 
    28 using Eraser.Manager; 
    2928using Eraser.Util; 
     29using Eraser.Plugins; 
     30using Eraser.Plugins.ExtensionPoints; 
    3031 
    3132namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTarget.cs

    r2344 r2368  
    3030using System.IO; 
    3131 
    32 using Eraser.Manager; 
    3332using Eraser.Util; 
    3433using Eraser.Util.ExtensionMethods; 
     34using Eraser.Plugins; 
     35using Eraser.Plugins.ExtensionPoints; 
    3536 
    3637namespace Eraser.DefaultPlugins 
     
    247248 
    248249                //Then delete the source directory. 
    249                 FileSystem fsManager = ManagerLibrary.Instance.FileSystemRegistrar[ 
     250                FileSystem fsManager = Host.Instance.FileSystems[ 
    250251                    VolumeInfo.FromMountPoint(Path)]; 
    251252                fsManager.DeleteFolder(subDirectory); 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/SecureMoveErasureTargetConfigurer.cs

    r2232 r2368  
    3131using System.Text.RegularExpressions; 
    3232 
    33 using Eraser.Manager; 
    3433using Eraser.Util; 
     34using Eraser.Plugins; 
     35using Eraser.Plugins.ExtensionPoints; 
    3536 
    3637namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/UnusedSpaceErasureTarget.cs

    r2344 r2368  
    3030using System.IO; 
    3131 
    32 using Eraser.Manager; 
    3332using Eraser.Util; 
    3433using Eraser.Util.ExtensionMethods; 
     34using Eraser.Plugins.ExtensionPoints; 
    3535 
    3636namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/ErasureTargets/UnusedSpaceErasureTargetConfigurer.cs

    r2232 r2368  
    3232using System.Text.RegularExpressions; 
    3333 
    34 using Eraser.Manager; 
    3534using Eraser.Util; 
    3635using Eraser.Util.ExtensionMethods; 
     36using Eraser.Plugins; 
     37using Eraser.Plugins.ExtensionPoints; 
    3738 
    3839namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/FileSystems/Fat.cs

    r2189 r2368  
    2626 
    2727using System.IO; 
    28 using Eraser.Manager; 
     28 
    2929using Eraser.Util; 
     30using Eraser.Plugins; 
     31using Eraser.Plugins.ExtensionPoints; 
    3032 
    3133namespace Eraser.DefaultPlugins 
     
    4446 
    4547        public override void EraseFileSystemObject(StreamInfo info, ErasureMethod method, 
    46             ErasureMethodProgressFunction callback) 
     48            ErasureMethod.ErasureMethodProgressFunction callback) 
    4749        { 
    4850            //Create the file stream, and call the erasure method to write to 
     
    6062                { 
    6163                    //Then erase the file. 
    62                     method.Erase(strm, long.MaxValue, 
    63                         ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng], 
    64                         callback 
    65                     ); 
     64                    method.Erase(strm, long.MaxValue, Host.Instance.Prngs.ActivePrng, callback); 
    6665                } 
    6766 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/FileSystems/Ntfs.cs

    r2162 r2368  
    2626 
    2727using System.IO; 
    28 using Eraser.Manager; 
     28 
    2929using Eraser.Util; 
     30using Eraser.Plugins; 
     31using Eraser.Plugins.ExtensionPoints; 
    3032 
    3133namespace Eraser.DefaultPlugins 
     
    6971 
    7072                        //Then run the erase task 
    71                         method.Erase(strm, long.MaxValue, ManagerLibrary.Instance.PrngRegistrar[ 
    72                                 ManagerLibrary.Settings.ActivePrng], null); 
     73                        method.Erase(strm, long.MaxValue, Host.Instance.Prngs.ActivePrng, null); 
    7374 
    7475                        //Call the callback function if one is provided. We'll provide a dummy 
     
    157158 
    158159        public override void EraseFileSystemObject(StreamInfo info, ErasureMethod method, 
    159             ErasureMethodProgressFunction callback) 
     160            ErasureMethod.ErasureMethodProgressFunction callback) 
    160161        { 
    161162            //Check if the file fits in one cluster - if it does it may be MFT resident 
     
    168169                    FileShare.None)) 
    169170                { 
    170                     method.Erase(strm, long.MaxValue, 
    171                         ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng], 
     171                    method.Erase(strm, long.MaxValue, Host.Instance.Prngs.ActivePrng, 
    172172                        null); 
    173173                } 
     
    190190 
    191191                //Then erase the file. 
    192                 method.Erase(strm, long.MaxValue, 
    193                     ManagerLibrary.Instance.PrngRegistrar[ManagerLibrary.Settings.ActivePrng], 
    194                     callback 
    195                 ); 
     192                method.Erase(strm, long.MaxValue, Host.Instance.Prngs.ActivePrng, callback); 
    196193 
    197194                //Set the length of the file to 0. 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/FileSystems/Windows.cs

    r2344 r2368  
    2727using System.IO; 
    2828using System.Threading; 
    29 using Eraser.Manager; 
     29 
    3030using Eraser.Util; 
    3131using Eraser.Util.ExtensionMethods; 
     32using Eraser.Plugins; 
     33using Eraser.Plugins.ExtensionPoints; 
    3234 
    3335namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Plugin.cs

    r2294 r2368  
    2525using System.Windows.Forms; 
    2626 
    27 using Eraser.Manager; 
    2827using Eraser.Plugins; 
    2928using Eraser.Util; 
     
    3837 
    3938            //Then register the erasure methods et al. 
    40             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new Gutmann());              //35 passes 
    41             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new DoD_EcE());              //7 passes 
    42             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new RCMP_TSSIT_OPS_II());    //7 passes 
    43             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new Schneier());             //7 passes 
    44             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new VSITR());                //7 passes 
    45             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new DoD_E());                //3 passes 
    46             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new HMGIS5Enhanced());       //3 passes 
    47             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new USAF5020());             //3 passes 
    48             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new USArmyAR380_19());       //3 passes 
    49             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new GOSTP50739());           //2 passes 
    50             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new HMGIS5Baseline());       //1 pass 
    51             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new Pseudorandom());         //1 pass 
     39            host.ErasureMethods.Add(new Gutmann());             //35 passes 
     40            host.ErasureMethods.Add(new DoD_EcE());             //7 passes 
     41            host.ErasureMethods.Add(new RCMP_TSSIT_OPS_II());   //7 passes 
     42            host.ErasureMethods.Add(new Schneier());                //7 passes 
     43            host.ErasureMethods.Add(new VSITR());               //7 passes 
     44            host.ErasureMethods.Add(new DoD_E());               //3 passes 
     45            host.ErasureMethods.Add(new HMGIS5Enhanced());      //3 passes 
     46            host.ErasureMethods.Add(new USAF5020());                //3 passes 
     47            host.ErasureMethods.Add(new USArmyAR380_19());      //3 passes 
     48            host.ErasureMethods.Add(new GOSTP50739());          //2 passes 
     49            host.ErasureMethods.Add(new HMGIS5Baseline());      //1 pass 
     50            host.ErasureMethods.Add(new Pseudorandom());            //1 pass 
    5251            EraseCustom.RegisterAll(); 
    53             ManagerLibrary.Instance.ErasureMethodRegistrar.Add(new FirstLast16KB()); 
     52            host.ErasureMethods.Add(new FirstLast16KB()); 
    5453 
    55             ManagerLibrary.Instance.PrngRegistrar.Add(new RngCrypto()); 
     54            host.Prngs.Add(new RngCrypto()); 
    5655 
    57             ManagerLibrary.Instance.EntropySourceRegistrar.Add(new KernelEntropySource()); 
     56            host.EntropySources.Add(new KernelEntropySource()); 
    5857 
    59             ManagerLibrary.Instance.FileSystemRegistrar.Add(new Fat12FileSystem()); 
    60             ManagerLibrary.Instance.FileSystemRegistrar.Add(new Fat16FileSystem()); 
    61             ManagerLibrary.Instance.FileSystemRegistrar.Add(new Fat32FileSystem()); 
    62             ManagerLibrary.Instance.FileSystemRegistrar.Add(new NtfsFileSystem()); 
     58            host.FileSystems.Add(new Fat12FileSystem()); 
     59            host.FileSystems.Add(new Fat16FileSystem()); 
     60            host.FileSystems.Add(new Fat32FileSystem()); 
     61            host.FileSystems.Add(new NtfsFileSystem()); 
    6362 
    64             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new FileErasureTarget()); 
    65             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new FolderErasureTarget()); 
    66             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new RecycleBinErasureTarget()); 
    67             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new UnusedSpaceErasureTarget()); 
    68             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new SecureMoveErasureTarget()); 
    69             ManagerLibrary.Instance.ErasureTargetRegistrar.Add(new DriveErasureTarget()); 
     63            host.ErasureTargetFactories.Add(new FileErasureTarget()); 
     64            host.ErasureTargetFactories.Add(new FolderErasureTarget()); 
     65            host.ErasureTargetFactories.Add(new RecycleBinErasureTarget()); 
     66            host.ErasureTargetFactories.Add(new UnusedSpaceErasureTarget()); 
     67            host.ErasureTargetFactories.Add(new SecureMoveErasureTarget()); 
     68            host.ErasureTargetFactories.Add(new DriveErasureTarget()); 
    7069        } 
    7170 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/RNGCrypto.cs

    r1802 r2368  
    2323using System.Collections.Generic; 
    2424using System.Text; 
     25 
    2526using System.Runtime.InteropServices; 
     27using System.Security.Cryptography; 
    2628 
    27 using Eraser.Manager; 
    28 using System.Security.Cryptography; 
    2929using Eraser.Util; 
     30using Eraser.Plugins; 
     31using Eraser.Plugins.ExtensionPoints; 
    3032 
    3133namespace Eraser.DefaultPlugins 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/SettingsForm.cs

    r1802 r2368  
    2929using System.Globalization; 
    3030 
    31 using Eraser.Manager; 
    3231using Eraser.Util; 
    3332 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Strings.en.resx

    r2282 r2368  
    262262    <value>The file {0} is a hard link or a symbolic link thus the contents of the file was not erased.</value> 
    263263  </data> 
     264  <data name="Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data." xml:space="preserve"> 
     265    <value>Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data.</value> 
     266  </data> 
    264267  <data name="Files in Folder" xml:space="preserve"> 
    265268    <value>Files in Folder</value> 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Strings.it.resx

    r2282 r2368  
    262262    <value>(Untranslated)</value> 
    263263  </data> 
     264  <data name="Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data." xml:space="preserve"> 
     265    <value>(Untranslated)</value> 
     266  </data> 
    264267  <data name="Files in Folder" xml:space="preserve"> 
    265268    <value>File in cartella</value> 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Strings.nl.resx

    r2282 r2368  
    262262    <value>(Untranslated)</value> 
    263263  </data> 
     264  <data name="Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data." xml:space="preserve"> 
     265    <value>(Untranslated)</value> 
     266  </data> 
    264267  <data name="Files in Folder" xml:space="preserve"> 
    265268    <value>(Untranslated)</value> 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Strings.pl.resx

    r2282 r2368  
    262262    <value>(Untranslated)</value> 
    263263  </data> 
     264  <data name="Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data." xml:space="preserve"> 
     265    <value>(Untranslated)</value> 
     266  </data> 
    264267  <data name="Files in Folder" xml:space="preserve"> 
    265268    <value>(Untranslated)</value> 
  • branches/eraser6/pluginsRewrite/Eraser.DefaultPlugins/Strings.resx

    r2282 r2368  
    262262    <value>The file {0} is a hard link or a symbolic link thus the contents of the file was not erased.</value> 
    263263  </data> 
     264  <data name="Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data." xml:space="preserve"> 
     265    <value>Plausible deniability was selected, but no decoy files were found. The current file has been only replaced with random data.</value> 
     266  </data> 
    264267  <data name="Files in Folder" xml:space="preserve"> 
    265268    <value>Files in Folder</value> 
Note: See TracChangeset for help on using the changeset viewer.