Changeset 3798 for trunk/sources/HeuristicLab.Core

Timestamp:

05/13/10 17:31:13 (14 years ago)

Author:

gkronber

Message:

Implemented fix for exceptions in CheckedItemCollection and CheckedItemCollection. #893

Location:

trunk/sources/HeuristicLab.Core/3.3/Collections

Files:

• CheckedItemCollection.cs (modified) (2 diffs)
• CheckedItemList.cs (modified) (3 diffs)

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

@@ -127 +127 @@
     protected override void OnCollectionReset(IEnumerable<T> items, IEnumerable<T> oldItems) {
       foreach (var oldItem in oldItems)
-        checkedState.Remove(oldItem);
+        if (!list.Contains(oldItem))
+          checkedState.Remove(oldItem);
       foreach (var item in items)
         if (!checkedState.ContainsKey(item))
@@ -151 +152 @@
     protected override void OnItemsRemoved(IEnumerable<T> items) {
       foreach (var item in items) {
-        checkedState.Remove(item);
+        if (!list.Contains(item))
+          checkedState.Remove(item);
       }
       base.OnItemsRemoved(items);

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

@@ -163 +163 @@
     protected override void OnCollectionReset(IEnumerable<IndexedItem<T>> items, IEnumerable<IndexedItem<T>> oldItems) {
       foreach (var oldIndexedItem in oldItems) {
-        checkedState.Remove(oldIndexedItem.Value);
+        if (!list.Contains(oldIndexedItem.Value))
+          checkedState.Remove(oldIndexedItem.Value);
       }
       foreach (var indexedItem in items) {
@@ -189 +190 @@
     protected override void OnItemsRemoved(IEnumerable<IndexedItem<T>> items) {
       foreach (var indexedItem in items)
-        checkedState.Remove(indexedItem.Value);
+        if (!list.Contains(indexedItem.Value))
+          checkedState.Remove(indexedItem.Value);
       base.OnItemsRemoved(items);
     }
@@ -200 +202 @@
     protected override void OnItemsReplaced(IEnumerable<IndexedItem<T>> items, IEnumerable<IndexedItem<T>> oldItems) {
       foreach (var oldIndexedItem in oldItems)
-        checkedState.Remove(oldIndexedItem.Value);
+        if (!list.Contains(oldIndexedItem.Value))
+          checkedState.Remove(oldIndexedItem.Value);
       foreach (var indexedItem in items)
         if (!checkedState.ContainsKey(indexedItem.Value))