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

Timestamp:

11/06/10 01:56:04 (14 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/KeyedItemCollection.cs (modified) (1 diff)

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

@@ -44 +44 @@
     }
 
+    [StorableConstructor]
+    protected KeyedItemCollection(bool deserializing) : base(deserializing) { }
+    protected KeyedItemCollection(KeyedItemCollection<TKey, TItem> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      foreach (TItem item in original.dict.Values) {
+        TItem clonedItem = cloner.Clone(item);
+        dict.Add(GetKeyForItem(clonedItem), clonedItem);
+      }
+    }
     protected KeyedItemCollection() : base() { }
     protected KeyedItemCollection(int capacity) : base(capacity) { }
     protected KeyedItemCollection(IEnumerable<TItem> collection) : base(collection) { }
-    [StorableConstructor]
-    protected KeyedItemCollection(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
       return Clone(new Cloner());
     }
-    public virtual IDeepCloneable Clone(Cloner cloner) {
-      KeyedItemCollection<TKey, TItem> clone = (KeyedItemCollection<TKey, TItem>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      foreach (TItem item in dict.Values) {
-        TItem clonedItem = (TItem)cloner.Clone(item);
-        clone.dict.Add(GetKeyForItem(clonedItem), clonedItem);
-      }
-      return clone;
-    }
+    public abstract IDeepCloneable Clone(Cloner cloner);
 
     public new ReadOnlyKeyedItemCollection<TKey, TItem> AsReadOnly() {