Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

Timestamp:

10/29/10 17:38:42 (13 years ago)

Author:

swagner

Message:

Finished cloning refactoring of HeuristicLab.Common, HeuristicLab.Collections and HeuristicLab.Core (#922)

File:

• branches/CloningRefactoring/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs (modified) (3 diffs)

branches/CloningRefactoring/HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs

@@ -46 +46 @@
 
     /// <summary>
+    /// Instantiates an empty CheckedItemCollection for deserialization.
+    /// </summary>
+    /// <param name="deserializing"></param>
+    [StorableConstructor]
+    protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
+    protected CheckedItemCollection(CheckedItemCollection<T> original, Cloner cloner)
+      : base(original, cloner) {
+      list = new List<T>(original.Select(x => cloner.Clone<T>(x)));
+      checkedState = new Dictionary<T, bool>();
+      foreach (var pair in original.checkedState)
+        checkedState.Add(cloner.Clone<T>(pair.Key), pair.Value);
+    }
+    /// <summary>
     /// Instantiates a new CheckedItemCollection.
     /// </summary>
@@ -71 +84 @@
           checkedState.Add(item, true);
     }
-    /// <summary>
-    /// Instantiates an empty CheckedItemCollection for deserialization.
-    /// </summary>
-    /// <param name="deserializing"></param>
-    [StorableConstructor]
-    protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
 
     /// <summary>
@@ -179 +186 @@
     /// <returns>A clone of the CheckedItemCollection</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      CheckedItemCollection<T> clone = (CheckedItemCollection<T>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.list = new List<T>(this.Select(x => (T)cloner.Clone(x)));
-      clone.checkedState = new Dictionary<T, bool>();
-      foreach (var pair in checkedState)
-        clone.checkedState.Add((T)cloner.Clone(pair.Key), pair.Value);
-      return clone;
+      return new CheckedItemCollection<T>(this, cloner);
     }
   }