Changeset 13886

Timestamp:

06/08/16 15:31:41 (8 years ago)

Author:

mkommend

Message:

#2575: Merged r13597 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Collections/3.3/ObservableCollection.cs (modified) (2 diffs)
• HeuristicLab.Collections/3.3/ObservableList.cs (modified) (4 diffs)

stable/HeuristicLab.Collections/3.3/ObservableCollection.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Linq;
 
 namespace HeuristicLab.Collections {
@@ -96 +97 @@
     public void AddRange(IEnumerable<T> collection) {
       int capacity = list.Capacity;
-      int count = list.Count;
-      list.AddRange(collection);
-      if (list.Count != count) {
+      ICollection<T> items = collection as ICollection<T> ?? collection.ToList();
+      list.AddRange(items);
+      if (items.Count > 0) {
         if (list.Capacity != capacity)
           OnPropertyChanged("Capacity");
         OnPropertyChanged("Count");
-        OnItemsAdded(collection);
+        OnItemsAdded(items);
       }
     }

stable/HeuristicLab.Collections/3.3/ObservableList.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using System;
 using System.Collections;
@@ -25 +27 @@
 using System.ComponentModel;
 using System.Linq;
-using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Collections {
@@ -169 +169 @@
       int capacity = list.Capacity;
       int index = list.Count;
-      list.AddRange(collection);
       List<IndexedItem<T>> items = new List<IndexedItem<T>>();
       foreach (T item in collection) {
@@ -175 +174 @@
         index++;
       }
+      list.AddRange(items.Select(x => x.Value));
       if (items.Count > 0) {
         OnItemsAdded(items);
-        OnItemsAdded(collection);
+        OnItemsAdded(items.Select(x => x.Value));
         if (list.Capacity != capacity)
           OnPropertyChanged("Capacity");