Changeset 3019 for trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableSet.cs

Timestamp:

03/14/10 18:26:23 (14 years ago)

Author:

swagner

Message:

Restructured persistence code of read-only observable collections (#548)

File:

• trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableSet.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Collections/3.3/ReadOnlyObservableSet.cs

@@ -33 +33 @@
     private IObservableSet<T> set;
 
-    #region persistence
-    private ReadOnlyObservableSet() { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void PostDeserizlationHook() {
-      RegisterEvents();
-    }
-    #endregion
-
     #region Properties
     public int Count {
@@ -52 +43 @@
 
     #region Constructors
+    protected ReadOnlyObservableSet() { }
     public ReadOnlyObservableSet(IObservableSet<T> set) {
       if (set == null) throw new ArgumentNullException();
       this.set = set;
       RegisterEvents();
-    }
-
-    private void RegisterEvents() {
-      set.ItemsAdded += new CollectionItemsChangedEventHandler<T>(set_ItemsAdded);
-      set.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(set_ItemsRemoved);
-      set.CollectionReset += new CollectionItemsChangedEventHandler<T>(set_CollectionReset);
-      set.PropertyChanged += new PropertyChangedEventHandler(set_PropertyChanged);
     }
     #endregion
@@ -143 +128 @@
 
     #region Events
+    [StorableHook(HookType.AfterDeserialization)]
+    protected void RegisterEvents() {
+      set.ItemsAdded += new CollectionItemsChangedEventHandler<T>(set_ItemsAdded);
+      set.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(set_ItemsRemoved);
+      set.CollectionReset += new CollectionItemsChangedEventHandler<T>(set_CollectionReset);
+      set.PropertyChanged += new PropertyChangedEventHandler(set_PropertyChanged);
+    }
+
     [field: NonSerialized]
     public event CollectionItemsChangedEventHandler<T> ItemsAdded;