Changeset 3562 for trunk/sources

Timestamp:

04/30/10 08:05:01 (14 years ago)

Author:

gkronber

Message:

Implemented changes as requested by swagner. #992 (CheckedItemList and CheckedItemCollection is necessary)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Collections/CheckedItemCollection.cs (modified) (4 diffs)
• HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs

@@ -56 +56 @@
       Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
       Content.CollectionReset -= new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
-      Content.ItemsChecked -= new CollectionItemsChangedEventHandler<T>(Content_ItemsChecked);
+      Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<T>(Content_ItemsChecked);
       base.DeregisterContentEvents();
     }
@@ -64 +64 @@
       Content.ItemsRemoved += new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
       Content.CollectionReset += new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
-      Content.ItemsChecked += new CollectionItemsChangedEventHandler<T>(Content_ItemsChecked);
+      Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<T>(Content_ItemsChecked);
     }
 
@@ -299 +299 @@
         foreach (T item in e.Items) {
           foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            if (listViewItem.Checked != Content.IsItemChecked(item))
-              listViewItem.Checked = Content.IsItemChecked(item);
+            if (listViewItem.Checked != Content.ItemChecked(item))
+              listViewItem.Checked = Content.ItemChecked(item);
           }
         }

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

@@ -60 +60 @@
     protected CheckedItemCollection(bool deserializing) : base(deserializing) { }
 
-    public bool IsItemChecked(T item) {
+    public bool ItemChecked(T item) {
       return checkedState[item];
     }
@@ -76 +76 @@
         checkedState.Remove(oldItem);
       foreach (var item in items)
-        checkedState.Add(item, false);
+        if (!checkedState.ContainsKey(item))
+          checkedState.Add(item, false);
       base.OnCollectionReset(items, oldItems);
     }
@@ -82 +83 @@
     protected override void OnItemsAdded(IEnumerable<T> items) {
       foreach (var item in items)
-        checkedState.Add(item, false);
+        if (!checkedState.ContainsKey(item))
+          checkedState.Add(item, false);
       base.OnItemsAdded(items);
     }
@@ -94 +96 @@
 
     protected virtual void OnItemsChecked(IEnumerable<T> items) {
-      RaiseItemsChecked(new CollectionItemsChangedEventArgs<T>(items));
+      RaiseCheckedItemsChanged(new CollectionItemsChangedEventArgs<T>(items));
     }
 
-    public event CollectionItemsChangedEventHandler<T> ItemsChecked;
-    private void RaiseItemsChecked(CollectionItemsChangedEventArgs<T> e) {
-      var handler = ItemsChecked;
+    public event CollectionItemsChangedEventHandler<T> CheckedItemsChanged;
+    private void RaiseCheckedItemsChanged(CollectionItemsChangedEventArgs<T> e) {
+      var handler = CheckedItemsChanged;
       if (handler != null) handler(this, e);
     }

trunk/sources/HeuristicLab.Core/3.3/Interfaces/ICheckedItemCollection.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Core {
-  public interface ICheckedItemCollection<T> : IItemCollection<T>, IItem where T : class, IItem {
-    event CollectionItemsChangedEventHandler<T> ItemsChecked;
+  public interface ICheckedItemCollection<T> : IItemCollection<T> where T : class, IItem {
+    event CollectionItemsChangedEventHandler<T> CheckedItemsChanged;
     IEnumerable<T> CheckedItems { get; }
-    bool IsItemChecked(T item);
+    bool ItemChecked(T item);
     void SetItemCheckedState(T item, bool checkedState);
   }