Changeset 4203 for trunk/sources

Timestamp:

08/12/10 11:57:28 (14 years ago)

Author:

mkommend

Message:

Refactored the code to remove a ListViewItems to use linq extension and added a comment to explain why only the first matching ListViewItem is removed. (ticket #1141)

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (3 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -271 +272 @@
       else {
         foreach (T item in e.Items) {
-          foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            RemoveListViewItem(listViewItem);
-            break;
-          }
+          //remove only the first matching ListViewItem, because the IItem could be contained multiple times in the ItemCollection
+          ListViewItem listviewItem = GetListViewItemsForItem(item).FirstOrDefault();
+          if (listviewItem != null)
+            RemoveListViewItem(listviewItem);
         }
       }
@@ -283 +284 @@
       else {
         foreach (T item in e.OldItems) {
-          foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            RemoveListViewItem(listViewItem);
-            break;
-          }
+          //remove only the first matching ListViewItem, because the IItem could be contained multiple times in the ItemCollection
+          ListViewItem listviewItem = GetListViewItemsForItem(item).FirstOrDefault();
+          if (listviewItem != null)
+            RemoveListViewItem(listviewItem);
         }
         foreach (T item in e.Items)

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs

@@ -316 +316 @@
         DeregisterRunEvents(e.Items);
         foreach (IRun item in e.Items) {
-          foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            RemoveListViewItem(listViewItem);
-            break;
-          }
+          //remove only the first matching ListViewItem, because the IRun could be contained multiple times in the ItemCollection
+          ListViewItem listviewItem = GetListViewItemsForItem(item).FirstOrDefault();
+          if (listviewItem != null)
+            RemoveListViewItem(listviewItem);
         }
         analyzeRunsToolStripDropDownButton.Enabled = itemsListView.Items.Count > 0;
@@ -332 +332 @@
         DeregisterRunEvents(e.OldItems);
         foreach (IRun item in e.OldItems) {
-          foreach (ListViewItem listViewItem in GetListViewItemsForItem(item)) {
-            RemoveListViewItem(listViewItem);
-            break;
-          }
+          //remove only the first matching ListViewItem, because the IRun could be contained multiple times in the ItemCollection
+          ListViewItem listviewItem = GetListViewItemsForItem(item).FirstOrDefault();
+          if (listviewItem != null)
+            RemoveListViewItem(listviewItem);
         }
         RegisterRunEvents(e.Items);