Changeset 4290

Timestamp:

08/23/10 15:29:13 (15 years ago)

Author:

mkommend

Message:

Corrected cloning and deserializing of ReadOnlyCheckedItemCollection and -list (ticket #1169).

Location:

trunk/sources/HeuristicLab.Core/3.3/Collections

Files:

• ReadOnlyCheckedItemCollection.cs (modified) (2 diffs)
• ReadOnlyCheckedItemList.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemCollection.cs ¶

@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -36 +37 @@
     public ReadOnlyCheckedItemCollection(ICheckedItemCollection<T> collection)
       : base(collection) {
-      collection.CheckedItemsChanged += new CollectionItemsChangedEventHandler<T>(collection_CheckedItemsChanged);
+      CheckedItemCollection.CheckedItemsChanged += new CollectionItemsChangedEventHandler<T>(collection_CheckedItemsChanged);
     }
 
     [StorableConstructor]
     protected ReadOnlyCheckedItemCollection(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      CheckedItemCollection.CheckedItemsChanged += new CollectionItemsChangedEventHandler<T>(collection_CheckedItemsChanged);
+    }
+
+    public override IDeepCloneable Clone(Common.Cloner cloner) {
+      ReadOnlyCheckedItemCollection<T> clone = (ReadOnlyCheckedItemCollection<T>)base.Clone(cloner);
+      clone.CheckedItemCollection.CheckedItemsChanged += new CollectionItemsChangedEventHandler<T>(clone.collection_CheckedItemsChanged);
+      return clone;
+    }
 
     #region ReadOnlyCheckedItemCollection<T> Members

trunk/sources/HeuristicLab.Core/3.3/Collections/ReadOnlyCheckedItemList.cs ¶

@@ -36 +36 @@
     public ReadOnlyCheckedItemList(ICheckedItemList<T> list)
       : base(list) {
-      list.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<T>>(list_CheckedItemsChanged);
+      CheckedItemList.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<T>>(list_CheckedItemsChanged);
     }
 
     [StorableConstructor]
     protected ReadOnlyCheckedItemList(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserializationHook() {
+      CheckedItemList.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<T>>(list_CheckedItemsChanged);
+    }
+
+    public override Common.IDeepCloneable Clone(Common.Cloner cloner) {
+      ReadOnlyCheckedItemList<T> clone = (ReadOnlyCheckedItemList<T>)base.Clone(cloner);
+      clone.CheckedItemList.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<T>>(clone.list_CheckedItemsChanged);
+      return clone;
+    }
+
 
     #region ICheckedItemList<T> Members