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

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

@@ -44 +44 @@
     }
 
+    [StorableConstructor]
+    protected ReadOnlyKeyedItemCollection(bool deserializing) : base(deserializing) { }
+    protected ReadOnlyKeyedItemCollection(ReadOnlyKeyedItemCollection<TKey, TItem> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      collection = cloner.Clone((IKeyedItemCollection<TKey, TItem>)original.collection);
+      RegisterEvents();
+    }
     protected ReadOnlyKeyedItemCollection() : base() { }
     public ReadOnlyKeyedItemCollection(IKeyedItemCollection<TKey, TItem> collection) : base(collection) { }
-    [StorableConstructor]
-    protected ReadOnlyKeyedItemCollection(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
@@ -53 +58 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ReadOnlyKeyedItemCollection<TKey, TItem> clone = (ReadOnlyKeyedItemCollection<TKey, TItem>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.collection = (IKeyedItemCollection<TKey, TItem>)((IKeyedItemCollection<TKey, TItem>)collection).Clone(cloner);
-      clone.RegisterEvents();
-      return clone;
+      return new ReadOnlyKeyedItemCollection<TKey, TItem>(this, cloner);
     }