Changeset 3564 for trunk/sources

Timestamp:

04/30/10 08:59:50 (15 years ago)

Author:

gkronber

Message:

Fixed a few minor issues in CheckedItemCollection. #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) (3 diffs)

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

@@ -30 +30 @@
 namespace HeuristicLab.Core.Views {
   [View("CheckedItemCollection View")]
+  [Content(typeof(ICheckedItemCollection<>), false)]
   [Content(typeof(CheckedItemCollection<>), true)]
   public partial class CheckedItemCollectionView<T> : ItemView where T : class, IItem {
@@ -127 +128 @@
       listViewItem.ToolTipText = item.ItemName + ": " + item.ItemDescription;
       listViewItem.Tag = item;
+      listViewItem.Checked = Content.ItemChecked(item);
       itemsListView.SmallImageList.Images.Add(item.ItemImage);
       listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1;
@@ -168 +170 @@
     #region ListView Events
     private void itemsListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
-      var checkedItem = e.Item;
-      Content.SetItemCheckedState((T)checkedItem.Tag, checkedItem.Checked);
+      var checkedItem = (T)e.Item.Tag;
+      if (Content.ItemChecked(checkedItem) != e.Item.Checked) {
+        Content.SetItemCheckedState(checkedItem, e.Item.Checked);
+      }
     }
 

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

@@ -55 +55 @@
       checkedState = new Dictionary<T, bool>();
       foreach (var item in collection)
-        checkedState.Add(item, false);
+        if (!checkedState.ContainsKey(item))
+          checkedState.Add(item, false);
     }
     [StorableConstructor]
@@ -68 +69 @@
       if (this.checkedState[item] != checkedState) {
         this.checkedState[item] = checkedState;
-        OnItemsChecked(new T[] { item });
+        OnCheckedItemsChanged(new T[] { item });
       }
     }
@@ -95 +96 @@
     }
 
-    protected virtual void OnItemsChecked(IEnumerable<T> items) {
+    protected virtual void OnCheckedItemsChanged(IEnumerable<T> items) {
       RaiseCheckedItemsChanged(new CollectionItemsChangedEventArgs<T>(items));
     }