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

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

@@ -47 +47 @@
     }
 
+    [StorableConstructor]
+    protected ReadOnlyItemDictionary(bool deserializing) : base(deserializing) { }
+    protected ReadOnlyItemDictionary(ReadOnlyItemDictionary<TKey, TValue> original, Cloner cloner) {
+      cloner.RegisterClonedObject(original, this);
+      dict = cloner.Clone((IItemDictionary<TKey, TValue>)original.dict);
+      RegisterEvents();
+    }
     public ReadOnlyItemDictionary() : base(new ItemDictionary<TKey, TValue>()) { }
     public ReadOnlyItemDictionary(IItemDictionary<TKey, TValue> dictionary) : base(dictionary) { }
-    [StorableConstructor]
-    protected ReadOnlyItemDictionary(bool deserializing) : base(deserializing) { }
 
     public object Clone() {
@@ -56 +61 @@
     }
     public virtual IDeepCloneable Clone(Cloner cloner) {
-      ReadOnlyItemDictionary<TKey, TValue> clone = (ReadOnlyItemDictionary<TKey, TValue>)Activator.CreateInstance(this.GetType());
-      cloner.RegisterClonedObject(this, clone);
-      clone.dict = (IItemDictionary<TKey, TValue>)((IItemDictionary<TKey, TValue>)dict).Clone(cloner);
-      clone.RegisterEvents();
-      return clone;
+      return new ReadOnlyItemDictionary<TKey, TValue>(this, cloner);
     }