Changeset 4722 for trunk/sources/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

Timestamp:

11/06/10 01:56:04 (13 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core/3.3/Collections/CheckedItemList.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Core/3.3/Collections/CheckedItemList.cs

@@ -48 +48 @@
       }
     }
+
+    /// <summary>
+    /// Instantiates a new CheckedItemList for deserialization.
+    /// </summary>
+    /// <param name="deserializing"></param>
+    [StorableConstructor]
+    protected CheckedItemList(bool deserializing) : base(deserializing) { }
+    protected CheckedItemList(CheckedItemList<T> original, Cloner cloner)
+      : base(original, cloner) {
+      list = new List<T>(original.Select(x => (T)cloner.Clone(x)));
+      checkedState = new Dictionary<T, bool>();
+      foreach (var pair in original.checkedState)
+        checkedState.Add(cloner.Clone(pair.Key), pair.Value);
+    }
     /// <summary>
     /// Instantiates an empty CheckedItemList.
@@ -75 +89 @@
       }
     }
-    /// <summary>
-    /// Instantiates a new CheckedItemList for deserialization.
-    /// </summary>
-    /// <param name="deserializing"></param>
-    [StorableConstructor]
-    protected CheckedItemList(bool deserializing) : base(deserializing) { }
 
     /// <summary>
@@ -228 +236 @@
     /// <returns>A deep clone of the CheckedItemList</returns>
     public override IDeepCloneable Clone(Cloner cloner) {
-      CheckedItemList<T> clone = (CheckedItemList<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 CheckedItemList<T>(this, cloner);
     }
   }