Changeset 9616 for branches/HivePerformance/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

Timestamp:

06/12/13 15:02:47 (11 years ago)

Author:

ascheibe

Message:

#2030 merged trunk into hive performance branch

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (5 diffs)

branches/HivePerformance/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -45 +45 @@
     }
 
+    public ItemCollection<T> ItemCollection {
+      get { return Content as ItemCollection<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();
       }
@@ -407 +421 @@
     #region Helpers
     protected virtual void SortItemsListView(SortOrder sortOrder) {
-      if (itemsListView.Sorting == sortOrder || sortOrder == SortOrder.None) return;
+      itemsListView.Sorting = SortOrder.None;
       itemsListView.Sorting = sortOrder;
-      itemsListView.Sort();
+      itemsListView.Sorting = SortOrder.None;
     }
     protected virtual void AdjustListViewColumnSizes() {