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

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

@@ -48 +48 @@
     }
 
+    [StorableConstructor]
+    protected ItemDictionary(bool deserializing) : base(deserializing) { }
+    protected ItemDictionary(ItemDictionary<TKey, TValue> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      foreach (TKey key in dict.Keys)
+        dict.Add(cloner.Clone<TKey>(key), cloner.Clone<TValue>(dict[key]));
+    }
     public ItemDictionary() : base() { }
     public ItemDictionary(int capacity) : base(capacity) { }
     public ItemDictionary(IDictionary<TKey, TValue> dictionary) : base(dictionary) { }
-    [StorableConstructor]
-    protected ItemDictionary(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
@@ -58 +63 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ItemDictionary<TKey, TValue> clone = (ItemDictionary<TKey, TValue>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      foreach (TKey key in dict.Keys)
-        clone.dict.Add((TKey)cloner.Clone(key), (TValue)cloner.Clone(dict[key]));
-      return clone;
+      return new ItemDictionary<TKey, TValue>(this, cloner);
     }