Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/21/14 10:10:29 (10 years ago)
Author:
abeham
Message:

#2106: merged r10324, r10477, r10787 to stable

Location:
stable
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Collections/3.3/ObservableArray.cs

    r9456 r10864  
    2525using System.ComponentModel;
    2626using System.Linq;
     27using HeuristicLab.Common;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2829
     
    168169        Array.Clear(array, index, length);
    169170        OnPropertyChanged("Item[]");
    170         OnItemsReplaced(GetIndexedItems(index, length), oldItems); 
     171        OnItemsReplaced(GetIndexedItems(index, length), oldItems);
    171172      }
    172173    }
     
    205206      if (array.Length > 1) {
    206207        IndexedItem<T>[] oldItems = GetIndexedItems();
    207         Array.Sort<T>(array);
     208        array.StableSort();
    208209        OnPropertyChanged("Item[]");
    209210        OnItemsMoved(GetIndexedItems(), oldItems);
     
    213214      if (array.Length > 1) {
    214215        IndexedItem<T>[] oldItems = GetIndexedItems();
    215         Array.Sort<T>(array, comparison);
     216        array.StableSort(comparison);
    216217        OnPropertyChanged("Item[]");
    217218        OnItemsMoved(GetIndexedItems(), oldItems);
     
    221222      if (array.Length > 1) {
    222223        IndexedItem<T>[] oldItems = GetIndexedItems();
    223         Array.Sort<T>(array, comparer);
     224        array.StableSort(comparer);
    224225        OnPropertyChanged("Item[]");
    225226        OnItemsMoved(GetIndexedItems(), oldItems);
     
    229230      if (length > 1) {
    230231        IndexedItem<T>[] oldItems = GetIndexedItems(index, length);
    231         Array.Sort<T>(array, index, length);
     232        array.StableSort(index, length);
    232233        OnPropertyChanged("Item[]");
    233234        OnItemsMoved(GetIndexedItems(index, length), oldItems);
     
    237238      if (length > 1) {
    238239        IndexedItem<T>[] oldItems = GetIndexedItems(index, length);
    239         Array.Sort<T>(array, index, length, comparer);
     240        array.StableSort(index, length, comparer);
    240241        OnPropertyChanged("Item[]");
    241242        OnItemsMoved(GetIndexedItems(index, length), oldItems);
Note: See TracChangeset for help on using the changeset viewer.