Changeset 2620 for trunk/sources/HeuristicLab.Collections/3.3/ObservableKeyedCollectionBase.cs

Timestamp:

01/11/10 03:55:51 (14 years ago)

Author:

swagner

Message:

Implemented INotifyPropertyChanged in all observable collections (#819)

File:

• trunk/sources/HeuristicLab.Collections/3.3/ObservableKeyedCollectionBase.cs (modified) (8 diffs)

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

@@ -24 +24 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
@@ -93 +94 @@
         }
       }
-      if (!oldKeyFound) throw new ArgumentException("item not found");
+      if (!oldKeyFound) throw new ArgumentException("Item not found");
       dict.Remove(oldKey);
       dict.Add(GetKeyForItem(item), item);
+      OnPropertyChanged("Item[]");
       OnItemsReplaced(new TItem[] { item }, new TItem[] { item });
     }
@@ -139 +141 @@
     public void Add(TItem item) {
       dict.Add(GetKeyForItem(item), item);
+      OnPropertyChanged("Item[]");
+      OnPropertyChanged("Count");
       OnItemsAdded(new TItem[] { item });
     }
     public void AddRange(IEnumerable<TItem> collection) {
       if (collection == null) throw new ArgumentNullException();
-      foreach (TItem item in collection)
+      bool empty = true;
+      foreach (TItem item in collection) {
         dict.Add(GetKeyForItem(item), item);
-      OnItemsAdded(collection);
+        empty = false;
+      }
+      if (!empty) {
+        OnPropertyChanged("Item[]");
+        OnPropertyChanged("Count");
+        OnItemsAdded(collection);
+      }
     }
 
@@ -152 +163 @@
       if (TryGetValue(key, out item)) {
         dict.Remove(key);
+        OnPropertyChanged("Item[]");
+        OnPropertyChanged("Count");
         OnItemsRemoved(new TItem[] { item });
         return true;
@@ -159 +172 @@
     public bool Remove(TItem item) {
       if (dict.Remove(GetKeyForItem(item))) {
+        OnPropertyChanged("Item[]");
+        OnPropertyChanged("Count");
         OnItemsRemoved(new TItem[] { item });
         return true;
@@ -171 +186 @@
           items.Add(item);
       }
-      if (items.Count > 0)
+      if (items.Count > 0) {
+        OnPropertyChanged("Item[]");
+        OnPropertyChanged("Count");
         OnItemsRemoved(items);
+      }
     }
     public int RemoveAll(Predicate<TItem> match) {
@@ -181 +199 @@
 
     public void Clear() {
-      TItem[] items = dict.Values.ToArray();
-      dict.Clear();
-      OnCollectionReset(new TItem[0], items);
+      if (dict.Count > 0) {
+        TItem[] items = dict.Values.ToArray();
+        dict.Clear();
+        OnPropertyChanged("Item[]");
+        OnPropertyChanged("Count");
+        OnCollectionReset(new TItem[0], items);
+      }
     }
     #endregion
@@ -257 +279 @@
         CollectionReset(this, new CollectionItemsChangedEventArgs<TItem>(items, oldItems));
     }
+
+    [field: NonSerialized]
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged(string propertyName) {
+      if (PropertyChanged != null)
+        PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+    }
     #endregion
   }