Changeset 2364

Timestamp:

11/7/2011 7:24:13 AM (19 months ago)

Author:

lowjoel

Message:

The ErasureTargetCollection? (renamed from ErasureTargetsCollection?) no longer has to set anything because the ErasureTarget? does not reference the Task any longer (not possible, as that will introduce cycles in dependencies)

Location:

branches/eraser6/pluginsRewrite

Files:

• Eraser.Manager/ErasureTargetCollection.cs (moved) (moved from branches/eraser6/pluginsRewrite/Eraser.Manager/ErasureTarget.cs) (5 diffs)
• Eraser.Manager/Task.cs (modified) (3 diffs)
• Eraser.Plugins/ExtensionPoints/ErasureTarget.cs (modified) (1 diff)

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

@@ -39 +39 @@
     /// </summary>
     [Serializable]
-    public class ErasureTargetsCollection : IList<ErasureTarget>, ISerializable
+    public class ErasureTargetCollection : IList<ErasureTarget>, ISerializable
     {
         #region Constructors
-        internal ErasureTargetsCollection(Task owner)
+        internal ErasureTargetCollection(Task owner)
         {
             this.list = new List<ErasureTarget>();
@@ -48 +48 @@
         }
 
-        internal ErasureTargetsCollection(Task owner, int capacity)
+        internal ErasureTargetCollection(Task owner, int capacity)
             : this(owner)
         {
@@ -54 +54 @@
         }
 
-        internal ErasureTargetsCollection(Task owner, IEnumerable<ErasureTarget> targets)
+        internal ErasureTargetCollection(Task owner, IEnumerable<ErasureTarget> targets)
             : this(owner)
         {
@@ -62 +62 @@
 
         #region Serialization Code
-        protected ErasureTargetsCollection(SerializationInfo info, StreamingContext context)
+        protected ErasureTargetCollection(SerializationInfo info, StreamingContext context)
         {
             list = (List<ErasureTarget>)info.GetValue("list", typeof(List<ErasureTarget>));
@@ -91 +91 @@
         public void Add(ErasureTarget item)
         {
-            item.Task = owner;
-            item.OnProgressChanged = owner.OnProgressChanged;
             list.Add(item);
         }

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

@@ -44 +44 @@
             Name = (string)info.GetValue("Name", typeof(string));
             Executor = context.Context as Executor;
-            Targets = (ErasureTargetsCollection)info.GetValue("Targets", typeof(ErasureTargetsCollection));
+            Targets = (ErasureTargetCollection)info.GetValue("Targets", typeof(ErasureTargetCollection));
             Targets.Owner = this;
             Log = (List<LogSink>)info.GetValue("Log", typeof(List<LogSink>));
@@ -79 +79 @@
         {
             Name = string.Empty;
-            Targets = new ErasureTargetsCollection(this);
+            Targets = new ErasureTargetCollection(this);
             Schedule = Schedule.RunNow;
             Canceled = false;
@@ -170 +170 @@
         /// The set of data to erase when this task is executed.
         /// </summary>
-        public ErasureTargetsCollection Targets { get; private set; }
+        public ErasureTargetCollection Targets { get; private set; }
 
         /// <summary>

branches/eraser6/pluginsRewrite/Eraser.Plugins/ExtensionPoints/ErasureTarget.cs

@@ -138 +138 @@
 
         /// <summary>
-        /// The progress of this target.
-        /// </summary>
-        public ProgressManagerBase Progress
-        {
-            get;
-            protected set;
-        }
-
-        /// <summary>
         /// The Progress Changed event handler of the owning task.
         /// </summary>