Changeset 4668 for branches/CloningRefactoring/HeuristicLab.Core/3.3/Collections/ItemArray.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/ItemArray.cs (modified) (2 diffs)

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

@@ -46 +46 @@
     }
 
+    [StorableConstructor]
+    protected ItemArray(bool deserializing) : base(deserializing) { }
+    protected ItemArray(ItemArray<T> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      array = original.Select(x => cloner.Clone<T>(x)).ToArray();
+    }
     public ItemArray() : base() { }
     public ItemArray(int length) : base(length) { }
     public ItemArray(T[] array) : base(array) { }
     public ItemArray(IEnumerable<T> collection) : base(collection) { }
-    [StorableConstructor]
-    protected ItemArray(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
@@ -57 +61 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemArray<T> clone = (ItemArray<T>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.array = this.Select(x => (T)cloner.Clone(x)).ToArray();
-      return clone;
+      return new ItemArray<T>(this, cloner);
     }