Changeset 4722 for trunk/sources/HeuristicLab.Core/3.3/Collections/ItemList.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/ItemList.cs (modified) (2 diffs)

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

@@ -46 +46 @@
     }
 
+    [StorableConstructor]
+    protected ItemList(bool deserializing) : base(deserializing) { }
+    protected ItemList(ItemList<T> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      list = new List<T>(original.Select(x => cloner.Clone(x)));
+    }
     public ItemList() : base() { }
     public ItemList(int capacity) : base(capacity) { }
     public ItemList(IEnumerable<T> collection) : base(collection) { }
-    [StorableConstructor]
-    protected ItemList(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
@@ -56 +60 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemList<T> clone = (ItemList<T>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.list = new List<T>(this.Select(x => (T)cloner.Clone(x)));
-      return clone;
+      return new ItemList<T>(this, cloner);
     }