Changeset 2286


Ignore:
Timestamp:
1/4/2011 4:58:54 AM (2 years ago)
Author:
lowjoel
Message:

Split the Eraser.Manager assembly from the Eraser.Plugins assembly. The code does not currently compile.

Location:
branches/eraser6/pluginsRewrite
Files:
4 added
10 edited
3 moved

Legend:

Unmodified
Added
Removed

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Eraser.Manager.csproj

    r2055 r2286  
    7070    <Compile Include="Executor.cs" /> 
    7171    <Compile Include="FileSystem.cs" /> 
    72     <Compile Include="IConfigurer.cs" /> 
    73     <Compile Include="IRegistrar.cs" /> 
    7472    <Compile Include="ManagerLibrary.cs" /> 
    7573    <Compile Include="ErasureMethod.cs" /> 
    76     <Compile Include="Plugins.cs" /> 
    7774    <Compile Include="PRNG.cs" /> 
    7875    <Compile Include="Properties\AssemblyInfo.cs" /> 
    … …  
    8380  </ItemGroup> 
    8481  <ItemGroup> 
     82    <ProjectReference Include="..\Eraser.Plugins\Eraser.Plugins.csproj"> 
     83      <Project>{59F7ED0F-3589-4112-B612-4A9A6588F4A0}</Project> 
     84      <Name>Eraser.Plugins</Name> 
     85    </ProjectReference> 
    8586    <ProjectReference Include="..\Eraser.Util.Native\Eraser.Util.Native.vcproj"> 
    8687      <Project>{BCFE7D20-FC82-4BBE-BFE4-7B635D70D238}</Project> 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/ManagerLibrary.cs

    r2049 r2286  
    4747            ErasureTargetRegistrar = new ErasureTargetRegistrar(); 
    4848            FileSystemRegistrar = new FileSystemRegistrar(); 
    49             Host = new Plugin.DefaultHost(); 
    50             Host.Load(); 
    5149        } 
    5250 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Strings.en.resx

    r2104 r2286  
    148148    <value>The file system on the drive {0} is not supported.</value> 
    149149  </data> 
    150   <data name="The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    151     <value>The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    152   </data> 
    153   <data name="The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    154     <value>The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    155   </data> 
    156   <data name="The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    157     <value>The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    158   </data> 
    159   <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve"> 
    160     <value>Could not load the plugin {0}.\n\nThe error returned was: {1}</value> 
    161   </data> 
    162   <data name="Eraser" xml:space="preserve"> 
    163     <value>Eraser</value> 
    164   </data> 
    165150  <data name="Running on restart" xml:space="preserve"> 
    166151    <value>Running on restart</value> 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Strings.it.resx

    r2104 r2286  
    148148    <value>Il tipo di file system sul disco {0} non è supportato.</value> 
    149149  </data> 
    150   <data name="The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    151     <value>(Untranslated)</value> 
    152   </data> 
    153   <data name="The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    154     <value>(Untranslated)</value> 
    155   </data> 
    156   <data name="The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    157     <value>(Untranslated)</value> 
    158   </data> 
    159   <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve"> 
    160     <value>Impossibile caricare il plugin {0}.\n\nL'errore ricevuto è stato: {1}</value> 
    161   </data> 
    162   <data name="Eraser" xml:space="preserve"> 
    163     <value>(Untranslated)</value> 
    164   </data> 
    165150  <data name="Running on restart" xml:space="preserve"> 
    166151    <value>Esecuzione al riavvio</value> 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Strings.nl.resx

    r2104 r2286  
    148148    <value>(Untranslated)</value> 
    149149  </data> 
    150   <data name="The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    151     <value>(Untranslated)</value> 
    152   </data> 
    153   <data name="The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    154     <value>(Untranslated)</value> 
    155   </data> 
    156   <data name="The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    157     <value>(Untranslated)</value> 
    158   </data> 
    159   <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve"> 
    160     <value>(Untranslated)</value> 
    161   </data> 
    162   <data name="Eraser" xml:space="preserve"> 
    163     <value>(Untranslated)</value> 
    164   </data> 
    165150  <data name="Running on restart" xml:space="preserve"> 
    166151    <value>(Untranslated)</value> 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Strings.pl.resx

    r2104 r2286  
    148148    <value>System plików napędu {0} nie jest wspierany.</value> 
    149149  </data> 
    150   <data name="The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    151     <value>(Untranslated)</value> 
    152   </data> 
    153   <data name="The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    154     <value>(Untranslated)</value> 
    155   </data> 
    156   <data name="The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    157     <value>(Untranslated)</value> 
    158   </data> 
    159   <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve"> 
    160     <value>Nie można było załadować wtyczki {0}.\n\nWystąpił błąd: {1}</value> 
    161   </data> 
    162   <data name="Eraser" xml:space="preserve"> 
    163     <value>Eraser</value> 
    164   </data> 
    165150  <data name="Running on restart" xml:space="preserve"> 
    166151    <value>Uruchomienie po restarcie</value> 

  • branches/eraser6/pluginsRewrite/Eraser.Manager/Strings.resx

    r2104 r2286  
    148148    <value>The file system on the drive {0} is not supported.</value> 
    149149  </data> 
    150   <data name="The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    151     <value>The Core plugin assembly is not one whichEraser expects.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    152   </data> 
    153   <data name="The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    154     <value>The provided Core plugin assembly is not a plugin.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    155   </data> 
    156   <data name="The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program." xml:space="preserve"> 
    157     <value>The provided Core plugin does not have an identical public key as the Eraser assembly.\n\nCheck that the Eraser installation is not corrupt, or reinstall the program.</value> 
    158   </data> 
    159   <data name="Could not load the plugin {0}.\n\nThe error returned was: {1}" xml:space="preserve"> 
    160     <value>Could not load the plugin {0}.\n\nThe error returned was: {1}</value> 
    161   </data> 
    162   <data name="Eraser" xml:space="preserve"> 
    163     <value>Eraser</value> 
    164   </data> 
    165150  <data name="Running on restart" xml:space="preserve"> 
    166151    <value>Running on restart</value> 

  • branches/eraser6/pluginsRewrite/Eraser.Plugins/Plugins.cs

    r2285 r2286  
    2727using System.IO; 
    2828using System.Reflection; 
    29 using System.Windows.Forms; 
    3029using System.Runtime.InteropServices; 
    3130using System.Security.Cryptography; 
    … …  
    3332 
    3433using Eraser.Util; 
    35 using Eraser.Util.ExtensionMethods; 
    36 using Path = System.IO.Path; 
    3734 
    3835namespace Eraser.Manager.Plugin 
    … …  
    6259 
    6360        /// <summary> 
     61        /// Constructor. Sets the global Plugin Host instance. 
     62        /// </summary> 
     63        /// <see cref="Host.Instance"/> 
     64        protected Host() 
     65        { 
     66            if (Instance != null) 
     67                throw new InvalidOperationException("Only one global Plugin Host instance can " + 
     68                    "exist at any one point of time."); 
     69            Instance = this; 
     70        } 
     71 
     72        /// <summary> 
    6473        /// Getter that retrieves the global plugin host instance. 
    6574        /// </summary> 
    6675        public static Host Instance 
    6776        { 
    68             get { return ManagerLibrary.Instance.Host; } 
     77            get; 
     78            private set; 
    6979        } 
    7080 
    … …  
    136146        /// Constructor. Loads all plugins in the Plugins folder. 
    137147        /// </summary> 
    138         public DefaultHost() 
    139         { 
     148        public DefaultHost() : base() 
     149        { 
     150            Load(); 
    140151        } 
    141152 
    … …  
    585596        /// <param name="parent">The parent control which the settings dialog should 
    586597        /// be parented with.</param> 
    587         void DisplaySettings(Control parent); 
     598        void DisplaySettings(System.Windows.Forms.Control parent); 
    588599    } 
    589600 

  • branches/eraser6/pluginsRewrite/Eraser.sln

    r2006 r2286  
    4949EndProject 
    5050Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eraser.BlackBox", "Eraser.BlackBox\Eraser.BlackBox.csproj", "{F8C3524E-B846-454B-BA41-5E2AA64BD56B}" 
     51EndProject 
     52Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eraser.Plugins", "Eraser.Plugins\Eraser.Plugins.csproj", "{59F7ED0F-3589-4112-B612-4A9A6588F4A0}" 
    5153EndProject 
    5254Global 
    … …  
    185187        {F8C3524E-B846-454B-BA41-5E2AA64BD56B}.Release|x64.ActiveCfg = Release|Any CPU 
    186188        {F8C3524E-B846-454B-BA41-5E2AA64BD56B}.Release|x64.Build.0 = Release|Any CPU 
     189        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 
     190        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU 
     191        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 
     192        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU 
     193        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|Win32.ActiveCfg = Debug|Any CPU 
     194        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Debug|x64.ActiveCfg = Debug|Any CPU 
     195        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU 
     196        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|Any CPU.Build.0 = Release|Any CPU 
     197        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 
     198        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU 
     199        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|Win32.ActiveCfg = Release|Any CPU 
     200        {59F7ED0F-3589-4112-B612-4A9A6588F4A0}.Release|x64.ActiveCfg = Release|Any CPU 
    187201    EndGlobalSection 
    188202    GlobalSection(SolutionProperties) = preSolution 

  • branches/eraser6/pluginsRewrite/Eraser/Eraser.csproj

    r2276 r2286  
    5353    <PlatformTarget>x86</PlatformTarget> 
    5454    <OutputPath>..\bin\Debug\</OutputPath> 
     55    <DefineConstants>TRACE;DEBUG</DefineConstants> 
    5556  </PropertyGroup> 
    5657  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 

  • branches/eraser6/pluginsRewrite/Eraser/Program.cs

    r2267 r2286  
    670670            using (Form dialog = new ShellConfirmationDialog(task)) 
    671671            { 
     672                dialog.BringToFront(); 
    672673                if (dialog.ShowDialog(parent) != DialogResult.Yes) 
    673674                    return; 
Note: See TracChangeset for help on using the changeset viewer.