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

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

@@ -29 +29 @@
   [StorableClass]
   public class NamedItemCollection<T> : KeyedItemCollection<string, T> where T : class, INamedItem {
+    [StorableConstructor]
+    protected NamedItemCollection(bool deserializing) : base(deserializing) { }
+    protected NamedItemCollection(NamedItemCollection<T> original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterItemEvents(this);
+    }
     public NamedItemCollection() : base() { }
     public NamedItemCollection(int capacity) : base(capacity) { }
     public NamedItemCollection(IEnumerable<T> collection)
       : base(collection) {
-      Initialize();
+      RegisterItemEvents(this);
     }
-    [StorableConstructor]
-    protected NamedItemCollection(bool deserializing) : base(deserializing) { }
 
     [StorableHook(HookType.AfterDeserialization)]
-    protected void Initialize() {
+    private void AfterDeserialization() {
       RegisterItemEvents(this);
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      NamedItemCollection<T> clone = (NamedItemCollection<T>)base.Clone(cloner);
-      clone.Initialize();
-      return clone;
+      return new NamedItemCollection<T>(this, cloner);
     }
 
@@ -73 +75 @@
     }
 
-    private void RegisterItemEvents(IEnumerable<T> items) {
+    protected void RegisterItemEvents(IEnumerable<T> items) {
       foreach (T item in items) {
         if (item != null) {