Changeset 10864 for stable/HeuristicLab.Collections
- Timestamp:
- 05/21/14 10:10:29 (11 years ago)
- Location:
- stable
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 10324,10477,10787
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Collections/3.3/HeuristicLab.Collections-3.3.csproj
r9000 r10864 157 157 </ItemGroup> 158 158 <ItemGroup> 159 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 160 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 161 <Name>HeuristicLab.Common-3.3</Name> 162 </ProjectReference> 159 163 <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj"> 160 164 <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project> -
stable/HeuristicLab.Collections/3.3/ObservableArray.cs
r9456 r10864 25 25 using System.ComponentModel; 26 26 using System.Linq; 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 29 … … 168 169 Array.Clear(array, index, length); 169 170 OnPropertyChanged("Item[]"); 170 OnItemsReplaced(GetIndexedItems(index, length), oldItems); 171 OnItemsReplaced(GetIndexedItems(index, length), oldItems); 171 172 } 172 173 } … … 205 206 if (array.Length > 1) { 206 207 IndexedItem<T>[] oldItems = GetIndexedItems(); 207 Array.Sort<T>(array);208 array.StableSort(); 208 209 OnPropertyChanged("Item[]"); 209 210 OnItemsMoved(GetIndexedItems(), oldItems); … … 213 214 if (array.Length > 1) { 214 215 IndexedItem<T>[] oldItems = GetIndexedItems(); 215 Array.Sort<T>(array,comparison);216 array.StableSort(comparison); 216 217 OnPropertyChanged("Item[]"); 217 218 OnItemsMoved(GetIndexedItems(), oldItems); … … 221 222 if (array.Length > 1) { 222 223 IndexedItem<T>[] oldItems = GetIndexedItems(); 223 Array.Sort<T>(array,comparer);224 array.StableSort(comparer); 224 225 OnPropertyChanged("Item[]"); 225 226 OnItemsMoved(GetIndexedItems(), oldItems); … … 229 230 if (length > 1) { 230 231 IndexedItem<T>[] oldItems = GetIndexedItems(index, length); 231 Array.Sort<T>(array,index, length);232 array.StableSort(index, length); 232 233 OnPropertyChanged("Item[]"); 233 234 OnItemsMoved(GetIndexedItems(index, length), oldItems); … … 237 238 if (length > 1) { 238 239 IndexedItem<T>[] oldItems = GetIndexedItems(index, length); 239 Array.Sort<T>(array,index, length, comparer);240 array.StableSort(index, length, comparer); 240 241 OnPropertyChanged("Item[]"); 241 242 OnItemsMoved(GetIndexedItems(index, length), oldItems); -
stable/HeuristicLab.Collections/3.3/ObservableList.cs
r9456 r10864 25 25 using System.ComponentModel; 26 26 using System.Linq; 27 using HeuristicLab.Common; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 29 … … 320 321 if (list.Count > 1) { 321 322 IndexedItem<T>[] oldItems = GetIndexedItems(); 322 list.S ort();323 list.StableSort(); 323 324 OnItemsMoved(GetIndexedItems(), oldItems); 324 325 OnPropertyChanged("Item[]"); … … 328 329 if (list.Count > 1) { 329 330 IndexedItem<T>[] oldItems = GetIndexedItems(); 330 list.S ort(comparison);331 list.StableSort(comparison); 331 332 OnItemsMoved(GetIndexedItems(), oldItems); 332 333 OnPropertyChanged("Item[]"); … … 336 337 if (list.Count > 1) { 337 338 IndexedItem<T>[] oldItems = GetIndexedItems(); 338 list.S ort(comparer);339 list.StableSort(comparer); 339 340 OnItemsMoved(GetIndexedItems(), oldItems); 340 341 OnPropertyChanged("Item[]"); … … 344 345 if (count > 1) { 345 346 IndexedItem<T>[] oldItems = GetIndexedItems(index, count); 346 list.S ort(index, count, comparer);347 list.StableSort(index, count, comparer); 347 348 OnItemsMoved(GetIndexedItems(index, count), oldItems); 348 349 OnPropertyChanged("Item[]"); -
stable/HeuristicLab.Collections/3.3/Plugin.cs.frame
r10032 r10864 29 29 [PluginFile("HeuristicLab.Collections-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Persistence", "3.3")] 31 [PluginDependency("HeuristicLab.Common", "3.3")] 31 32 public class HeuristicLabCollectionsPlugin : PluginBase { 32 33 }
Note: See TracChangeset
for help on using the changeset viewer.