Changeset 2440

Timestamp:

3/10/2012 1:35:11 PM (15 months ago)

Author:

lowjoel

Message:

Use the new identifier names defined in Eraser.Plugins.

Location:

branches/eraser6/pluginsRewrite

Files:

• Eraser.BlackBox/Properties/AssemblyInfo.cs (modified) (1 diff)
• Eraser.Manager/DirectExecutor.cs (modified) (1 diff)
• Eraser.Manager/ErasureTargetCollection.cs (modified) (10 diffs)
• Eraser.Manager/ManagerLibrary.cs (modified) (1 diff)
• Eraser.Manager/Task.cs (modified) (3 diffs)
• Eraser.Plugins/Eraser.Plugins.csproj (modified) (1 diff)
• Eraser.Plugins/Registrars/ErasureMethodRegistrar.cs (modified) (3 diffs)
• Eraser.Plugins/Registrars/ErasureTargetFactoryRegistrar.cs (modified) (1 diff)
• Eraser.Plugins/Registrars/FileSystemRegistrar.cs (modified) (2 diffs)
• Eraser.Plugins/Registrars/PrngRegistrar.cs (modified) (3 diffs)
• Eraser/SettingsPanel.cs (modified) (2 diffs)
• Eraser/TaskDataSelectionForm.cs (modified) (8 diffs)

branches/eraser6/pluginsRewrite/Eraser.BlackBox/Properties/AssemblyInfo.cs

@@ -26 +26 @@
 
 // The plugin is an optional Eraser plugin, which should default to not load.
-[assembly: Eraser.Plugins.LoadingPolicy(Eraser.Plugins.LoadingPolicy.DefaultOff)]
+[assembly: Eraser.Plugins.PluginLoadingPolicy(Eraser.Plugins.PluginLoadingPolicy.DefaultOff)]

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

@@ -287 +287 @@
 
                 //Run the task
-                foreach (ErasureTarget target in task.Targets)
+                foreach (IErasureTarget target in task.Targets)
                     try
                     {

branches/eraser6/pluginsRewrite/Eraser.Manager/ErasureTargetCollection.cs

@@ -39 +39 @@
     /// </summary>
     [Serializable]
-    public class ErasureTargetCollection : IList<ErasureTarget>, ISerializable
+    public class ErasureTargetCollection : IList<IErasureTarget>, ISerializable
     {
         #region Constructors
         internal ErasureTargetCollection(Task owner)
         {
-            this.list = new List<ErasureTarget>();
+            this.list = new List<IErasureTarget>();
             this.owner = owner;
         }
@@ -54 +54 @@
         }
 
-        internal ErasureTargetCollection(Task owner, IEnumerable<ErasureTarget> targets)
+        internal ErasureTargetCollection(Task owner, IEnumerable<IErasureTarget> targets)
             : this(owner)
         {
@@ -64 +64 @@
         protected ErasureTargetCollection(SerializationInfo info, StreamingContext context)
         {
-            list = (List<ErasureTarget>)info.GetValue("list", typeof(List<ErasureTarget>));
+            list = (List<IErasureTarget>)info.GetValue("list", typeof(List<IErasureTarget>));
         }
 
@@ -75 +75 @@
 
         #region IEnumerable<ErasureTarget> Members
-        public IEnumerator<ErasureTarget> GetEnumerator()
+        public IEnumerator<IErasureTarget> GetEnumerator()
         {
             return list.GetEnumerator();
@@ -89 +89 @@
 
         #region ICollection<ErasureTarget> Members
-        public void Add(ErasureTarget item)
+        public void Add(IErasureTarget item)
         {
             list.Add(item);
@@ -96 +96 @@
         public void Clear()
         {
-            foreach (ErasureTarget item in list)
+            foreach (IErasureTarget item in list)
                 Remove(item);
         }
 
-        public bool Contains(ErasureTarget item)
+        public bool Contains(IErasureTarget item)
         {
             return list.Contains(item);
         }
 
-        public void CopyTo(ErasureTarget[] array, int arrayIndex)
+        public void CopyTo(IErasureTarget[] array, int arrayIndex)
         {
             list.CopyTo(array, arrayIndex);
@@ -126 +126 @@
         }
 
-        public bool Remove(ErasureTarget item)
+        public bool Remove(IErasureTarget item)
         {
             int index = list.IndexOf(item);
@@ -138 +138 @@
 
         #region IList<ErasureTarget> Members
-        public int IndexOf(ErasureTarget item)
+        public int IndexOf(IErasureTarget item)
         {
             return list.IndexOf(item);
         }
 
-        public void Insert(int index, ErasureTarget item)
+        public void Insert(int index, IErasureTarget item)
         {
             list.Insert(index, item);
@@ -153 +153 @@
         }
 
-        public ErasureTarget this[int index]
+        public IErasureTarget this[int index]
         {
             get
@@ -184 +184 @@
         /// The list bring the data store behind this object.
         /// </summary>
-        private List<ErasureTarget> list;
+        private List<IErasureTarget> list;
     }
 }

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

@@ -95 +95 @@
             //There's no approval or denial, what is the specified loading policy?
             else
-                e.Load = e.Plugin.LoadingPolicy != LoadingPolicy.DefaultOff;
+                e.Load = e.Plugin.LoadingPolicy != PluginLoadingPolicy.DefaultOff;
         }
 

branches/eraser6/pluginsRewrite/Eraser.Manager/Task.cs

@@ -125 +125 @@
                 {
                     //Simpler case, small set of data.
-                    foreach (ErasureTarget tgt in Targets)
+                    foreach (IErasureTarget tgt in Targets)
                         result += S._("{0}, ", tgt.UIText);
 
@@ -272 +272 @@
         /// object.
         /// </summary>
-        /// <param name="sender">The <see cref="ErasureTarget"/> which is reporting
+        /// <param name="sender">The <see cref="IErasureTarget"/> which is reporting
         /// progress.</param>
         /// <param name="e">The new progress value.</param>
@@ -278 +278 @@
         /// <see cref="TaskProgressEventargs"/></exception>
         /// <exception cref="ArgumentNullException">Both sender and e cannot be null.</exception>
-        internal void OnProgressChanged(ErasureTarget sender, ProgressChangedEventArgs e)
+        internal void OnProgressChanged(IErasureTarget sender, ProgressChangedEventArgs e)
         {
             if (sender == null)

branches/eraser6/pluginsRewrite/Eraser.Plugins/Eraser.Plugins.csproj

@@ -54 +54 @@
     </Compile>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="ExtensionPoints\EntropySource.cs" />
-    <Compile Include="ExtensionPoints\ErasureMethod.cs" />
-    <Compile Include="ExtensionPoints\ErasureTarget.cs" />
-    <Compile Include="ExtensionPoints\FileSystem.cs" />
+    <Compile Include="ExtensionPoints\IEntropySource.cs" />
+    <Compile Include="ExtensionPoints\IErasureMethod.cs" />
+    <Compile Include="ExtensionPoints\IErasureTarget.cs" />
+    <Compile Include="ExtensionPoints\IFileSystem.cs" />
     <Compile Include="ExtensionPoints\Prng.cs" />
     <Compile Include="IConfigurer.cs" />

branches/eraser6/pluginsRewrite/Eraser.Plugins/Registrars/ErasureMethodRegistrar.cs

@@ -38 +38 @@
     /// do not have run-time equivalents; they all are compile-time.
     /// </summary>
-    public class ErasureMethodRegistrar : Registrar<ErasureMethod>
+    public class ErasureMethodRegistrar : Registrar<IErasureMethod>
     {
         #region Default Erasure method
-        private class DefaultMethod : ErasureMethod
+        private class DefaultMethod : IErasureMethod
         {
             public DefaultMethod()
@@ -68 +68 @@
             }
 
-            public override void Erase(Stream strm, long erasureLength, Prng prng,
-                ErasureMethod.ErasureMethodProgressFunction callback)
+            public override void Erase(Stream strm, long erasureLength, IPrng prng,
+                IErasureMethod.ErasureMethodProgressFunction callback)
             {
                 throw new InvalidOperationException("The DefaultMethod class should never " +
@@ -82 +82 @@
         /// </summary>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes")]
-        public static readonly ErasureMethod Default = new DefaultMethod();
+        public static readonly IErasureMethod Default = new DefaultMethod();
         #endregion
     }

branches/eraser6/pluginsRewrite/Eraser.Plugins/Registrars/ErasureTargetFactoryRegistrar.cs

@@ -29 +29 @@
 namespace Eraser.Plugins.Registrars
 {
-    public class ErasureTargetFactoryRegistrar : FactoryRegistrar<ErasureTarget>
+    public class ErasureTargetFactoryRegistrar : FactoryRegistrar<IErasureTarget>
     {
     }

branches/eraser6/pluginsRewrite/Eraser.Plugins/Registrars/FileSystemRegistrar.cs

@@ -30 +30 @@
 namespace Eraser.Plugins.Registrars
 {
-    public class FileSystemRegistrar : Registrar<FileSystem>
+    public class FileSystemRegistrar : Registrar<IFileSystem>
     {
         /// <summary>
@@ -41 +41 @@
         /// <exception cref="NotSupportedException">Thrown when an unimplemented
         /// file system is requested.</exception>
-        public FileSystem this[VolumeInfo volume]
+        public IFileSystem this[VolumeInfo volume]
         {
             get
             {
-                foreach (FileSystem filesystem in this)
+                foreach (IFileSystem filesystem in this)
                     if (filesystem.Name.ToUpperInvariant() ==
                         volume.VolumeFormat.ToUpperInvariant())

branches/eraser6/pluginsRewrite/Eraser.Plugins/Registrars/PrngRegistrar.cs

@@ -32 +32 @@
     /// Class managing all the PRNG algorithms.
     /// </summary>
-    public class PrngRegistrar : Registrar<Prng>
+    public class PrngRegistrar : Registrar<IPrng>
     {
         /// <summary>
@@ -46 +46 @@
         /// <remarks>Client code should set the <see cref="ActivePrngGuid"/>
         /// member.</remarks>
-        public Prng ActivePrng
+        public IPrng ActivePrng
         {
             get
@@ -70 +70 @@
         {
             lock (this)
-                foreach (Prng prng in Host.Instance.Prngs)
+                foreach (IPrng prng in Host.Instance.Prngs)
                     prng.Reseed(entropy);
         }

branches/eraser6/pluginsRewrite/Eraser/SettingsPanel.cs

@@ -79 +79 @@
             //Visually display the other metadata associated with the assembly
             item.ImageIndex = e.Plugin.AssemblyAuthenticode == null ? -1 : 0;
-            item.Group = e.Plugin.LoadingPolicy == LoadingPolicy.Core ?
+            item.Group = e.Plugin.LoadingPolicy == PluginLoadingPolicy.Core ?
                 pluginsManager.Groups[0] : pluginsManager.Groups[1];
             item.SubItems.Add(e.Plugin.Assembly.GetFileVersion().ToString());
@@ -310 +310 @@
             ListViewItem item = pluginsManager.Items[e.Index];
             PluginInfo plugin = (PluginInfo)item.Tag;
-            if (plugin.LoadingPolicy == LoadingPolicy.Core)
+            if (plugin.LoadingPolicy == PluginLoadingPolicy.Core)
                 e.NewValue = CheckState.Checked;
         }

branches/eraser6/pluginsRewrite/Eraser/TaskDataSelectionForm.cs

@@ -29 +29 @@
 using System.Windows.Forms;
 
+using System.IO;
+
 using Eraser.Manager;
 using Eraser.Util;
 using Eraser.Util.ExtensionMethods;
-using System.IO;
+using Eraser.Plugins.ExtensionPoints;
 
 namespace Eraser
@@ -40 +42 @@
         private class ErasureType
         {
-            public ErasureType(ErasureTarget target)
+            public ErasureType(IErasureTarget target)
             {
                 Target = target;
@@ -50 +52 @@
             }
 
-            public ErasureTarget Target;
+            public IErasureTarget Target;
 
             /// <summary>
@@ -65 +67 @@
 
             //Insert the types of erasure targets
-            foreach (ErasureTarget target in ManagerLibrary.Instance.ErasureTargetRegistrar)
+            foreach (IErasureTarget target in ManagerLibrary.Instance.ErasureTargetRegistrar)
                 typeCmb.Items.Add(new ErasureType(target));
             if (typeCmb.Items.Count != 0) 
@@ -72 +74 @@
             //And the methods list
             methodCmb.Items.Add(ErasureMethodRegistrar.Default);
-            foreach (ErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar)
+            foreach (IErasureMethod method in ManagerLibrary.Instance.ErasureMethodRegistrar)
                 methodCmb.Items.Add(method);
             if (methodCmb.Items.Count != 0)
@@ -83 +85 @@
         /// <returns>An Eraser.Manager.Task.Data or Eraser.Manager.Task.UnusedSpace object
         /// or any of its inherited classes, depending on the task selected</returns>
-        public ErasureTarget Target
+        public IErasureTarget Target
         {
             get
             {
                 ErasureType type = (ErasureType)typeCmb.SelectedItem;
-                ErasureTarget result = type.Target;
+                IErasureTarget result = type.Target;
                 if (type.Configurer != null)
                     type.Configurer.SaveTo(result);
-                result.Method = (ErasureMethod)methodCmb.SelectedItem;
+                result.Method = (IErasureMethod)methodCmb.SelectedItem;
 
                 return result;
@@ -99 +101 @@
                 //Set the erasure method.
                 foreach (object item in methodCmb.Items)
-                    if (((ErasureMethod)item).Guid == value.Method.Guid)
+                    if (((IErasureMethod)item).Guid == value.Method.Guid)
                         methodCmb.SelectedItem = item;
 
@@ -149 +151 @@
             ErasureType type = (ErasureType)typeCmb.SelectedItem;
             if (methodCmb.SelectedItem != ErasureMethodRegistrar.Default &&
-                !type.Target.SupportsMethod((ErasureMethod)methodCmb.SelectedItem))
+                !type.Target.SupportsMethod((IErasureMethod)methodCmb.SelectedItem))
             {
                 errorProvider.SetError(methodCmb, S._("The erasure method selected does " +