Changeset 10529

Timestamp:

03/04/14 11:28:56 (11 years ago)

Author:

gkronber

Message:

#1971: merged r9613 and r10495 from trunk into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (4 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs (modified) (3 diffs)

stable/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -45 +45 @@
     }
 
+    public ObservableCollection<T> ItemCollection {
+      get { return Content as ObservableCollection<T>; }
+    }
+
     public bool ShowDetails {
       get { return showDetailsCheckBox.Checked; }
@@ -232 +236 @@
       if (e.KeyCode == Keys.Delete) {
         if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly && !ReadOnly) {
-          foreach (ListViewItem item in itemsListView.SelectedItems)
-            Content.Remove((T)item.Tag);
+          if (ItemCollection != null) ItemCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (T)i.Tag));
+          else {
+            foreach (ListViewItem item in itemsListView.SelectedItems)
+              Content.Remove((T)item.Tag);
+          }
         }
       }
@@ -304 +311 @@
             items = items.Select(x => cloner.Clone(x));
           }
-          foreach (T item in items)
-            Content.Add(item);
+          if (ItemCollection != null) ItemCollection.AddRange(items);
+          else {
+            foreach (T item in items)
+              Content.Add(item);
+          }
         }
       }
@@ -325 +335 @@
     protected virtual void removeButton_Click(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count > 0) {
-        foreach (ListViewItem item in itemsListView.SelectedItems)
-          Content.Remove((T)item.Tag);
+        if (ItemCollection != null) {
+          ItemCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (T)i.Tag));
+        } else {
+          foreach (ListViewItem item in itemsListView.SelectedItems)
+            Content.Remove((T)item.Tag);
+        }
         itemsListView.SelectedItems.Clear();
       }

stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs

@@ -255 +255 @@
       if (e.KeyCode == Keys.Delete) {
         if ((itemsListView.SelectedItems.Count > 0) && !Content.IsReadOnly && !ReadOnly) {
-          foreach (ListViewItem item in itemsListView.SelectedItems)
-            Content.Remove((IRun)item.Tag);
+          if (RunCollection != null) {
+            RunCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (IRun)i.Tag));
+          } else {
+            foreach (ListViewItem item in itemsListView.SelectedItems)
+              Content.Remove((IRun)item.Tag);
+          }
         }
       }
@@ -350 +354 @@
     private void removeButton_Click(object sender, EventArgs e) {
       if (itemsListView.SelectedItems.Count > 0) {
-        foreach (ListViewItem item in itemsListView.SelectedItems)
-          Content.Remove((IRun)item.Tag);
+        if (RunCollection != null) {
+          RunCollection.RemoveRange(itemsListView.SelectedItems.Cast<ListViewItem>().Select(i => (IRun)i.Tag));
+        } else {
+          foreach (ListViewItem item in itemsListView.SelectedItems)
+            Content.Remove((IRun)item.Tag);
+        }
         itemsListView.SelectedItems.Clear();
       }
@@ -377 +385 @@
       try {
         RunCollection.Modify();
-      } finally {
+      }
+      finally {
         ReadOnly = false;
       }