Changeset 5302

Timestamp:

01/16/11 03:14:15 (14 years ago)

Author:

swagner

Message:

Fixed exception which was thrown when item updates are still pending after the content of an ItemCollectionView has already been changed (#1324)

Location:

trunk/sources

Files:

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

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -139 +140 @@
         try {
           return (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
         }
@@ -213 +215 @@
         return listViewItems;
       } else {
-        return itemListViewItemMapping[item];
+        List<ListViewItem> listViewItems = null;
+        itemListViewItemMapping.TryGetValue(item, out listViewItems);
+        return listViewItems == null ? Enumerable.Empty<ListViewItem>() : listViewItems;
       }
     }

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

@@ -128 +128 @@
         try {
           return (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
         }
@@ -195 +196 @@
         return listViewItems;
       } else {
-        return itemListViewItemMapping[item];
+        List<ListViewItem> listViewItems = null;
+        itemListViewItemMapping.TryGetValue(item, out listViewItems);
+        return listViewItems == null ? Enumerable.Empty<ListViewItem>() : listViewItems;
       }
     }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Collections;
@@ -142 +143 @@
         try {
           return (T)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType();
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           ErrorHandling.ShowErrorDialog(this, ex);
         }
@@ -216 +218 @@
         return listViewItems;
       } else {
-        return itemListViewItemMapping[item];
+        List<ListViewItem> listViewItems = null;
+        itemListViewItemMapping.TryGetValue(item, out listViewItems);
+        return listViewItems == null ? Enumerable.Empty<ListViewItem>() : listViewItems;
       }
     }

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

@@ -216 +216 @@
         return listViewItems;
       } else {
-        return itemListViewItemMapping[item];
+        List<ListViewItem> listViewItems = null;
+        itemListViewItemMapping.TryGetValue(item, out listViewItems);
+        return listViewItems == null ? Enumerable.Empty<ListViewItem>() : listViewItems;
       }
     }