refactor: Move IObservableCollection to Spark.Core.Collections

This commit is contained in:
John Colvin committed 2022-08-16 17:25:02 -04:00
1 parent c271af30d8
commit 836683bcbe
38 files changed
+84 -24

No files matched your search

@@ -13,6 +13,7 @@ namespace mbts.spark.VolSurface {
using mbts.ui.utility;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
@@ -18,6 +18,7 @@ namespace mbts.spark {
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.Core.Reflection;
using Spark.Trading;
@@ -6,6 +6,8 @@ using mbts.ui.converters;
using mbts.ui.shell;
using mbts.ui.utility;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -13,6 +13,7 @@ using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
@@ -6,6 +6,8 @@ using mbts.ui.controls;
using mbts.ui.converters;
using mbts.ui.utility;
using Spark.Core.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -4,6 +4,8 @@ using mbts.ui.controls;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.ObjectModel;
using System.Reactive.Disposables;
@@ -17,6 +17,8 @@ namespace Spark.Trading {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Data;
using System;
@@ -20,6 +20,9 @@ namespace mbts.spark {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -6,6 +6,8 @@ using mbts.ui.controls;
using mbts.ui.spark;
using mbts.ui.utility;
using Spark.Core.Collections;
using System;
namespace mbts.spark {
@@ -18,6 +18,7 @@ using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections;
@@ -19,6 +19,7 @@ using mbts.ui.spark;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.Trading;
using Spark.ViewModel.Commands;
@@ -2,7 +2,6 @@ namespace mbts.spark {
using bts;
using bts.api;
using bts.api.orderman;
using bts.collections;
using bts.utils;
using mbts.spark.utilities;
@@ -13,6 +12,7 @@ namespace mbts.spark {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.ViewModel.Commands;
using System;
@@ -1,11 +1,12 @@
using bts.api.orderman;
using bts.collections;
using mbts.spark;
using mbts.ui;
using mbts.ui.controls;
using mbts.ui.shell;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Windows;
@@ -1,10 +1,11 @@
using bts.api;
using bts.collections;
using mbts.spark;
using mbts.ui.converters;
using mbts.ui.extensions;
using Spark.Core.Collections;
using System;
using System.Collections;
using System.Linq;
@@ -18,6 +18,7 @@ namespace bts.shell.pnl {
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.Core.Reflection;
using Spark.Trading;
@@ -19,6 +19,7 @@ namespace Spark.Trading {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Data;
using Spark.ViewModel.Commands;
@@ -13,6 +13,7 @@ using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.ViewModel.Commands;
using System;
@@ -1,11 +1,12 @@
using bts.collections;
using bts.spark;
using bts.spark;
using mbts.spark.utilities;
using mbts.ui.controls;
using mbts.ui.shell;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -9,6 +9,8 @@ using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -15,6 +15,7 @@ using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
@@ -5,6 +5,8 @@ using mbts.spark;
using mbts.ui.spark;
using mbts.ui.utility;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -12,6 +12,7 @@ namespace mbts.analytics {
using mbts.ui.utility;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
@@ -6,18 +6,16 @@ namespace mbts.analytics {
using bts.collections;
using bts.utils;
using mbts.collections;
using mbts.spark;
using mbts.ui;
using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Reactive.Linq;
@@ -1,9 +1,10 @@
namespace mbts.collections {
using bts.collections;
using bts.utils;
using mbts.ui.shell;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -1,5 +1,7 @@
using bts.collections;
using Spark.Core.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -234,12 +236,14 @@ namespace mbts.ui.controls {
_check_disposed();
int offset = _get_collection_start(sender);
switch (e.Action) {
case NotifyCollectionChangedAction.Add: _target.InsertRange(e.NewStartingIndex + offset, e.NewItems); break;
case NotifyCollectionChangedAction.Add:
_target.InsertRange(e.NewStartingIndex + offset, e.NewItems.Cast<T>());
break;
case NotifyCollectionChangedAction.Remove: _target.RemoveRange(e.OldStartingIndex + offset, e.OldItems.Count); break;
case NotifyCollectionChangedAction.Move: _target.Move(e.OldStartingIndex + offset, e.NewStartingIndex + offset); break;
case NotifyCollectionChangedAction.Replace:
_target.RemoveRange(e.OldStartingIndex + offset, e.OldItems.Count);
_target.InsertRange(e.NewStartingIndex + offset, e.NewItems);
_target.InsertRange(e.NewStartingIndex + offset, e.NewItems.Cast<T>());
break;
case NotifyCollectionChangedAction.Reset:
var c = (ObservableCollection<T>)sender;
@@ -2,6 +2,8 @@
using NUnit.Framework;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -5,6 +5,7 @@ using mbts.utils;
using NUnit.Framework;
using Spark.Core.Collections;
using Spark.Core.Reflection;
using System;
@@ -1,6 +1,8 @@
using bts.collections;
using bts.utils;
using Spark.Core.Collections;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -4,6 +4,8 @@ using mbts.collections;
using mbts.ui;
using mbts.ui.shell;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -1,7 +1,7 @@
using bts.collections;
using bts.utils;
using mbts.ui.shell;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
@@ -1,7 +1,6 @@
using bts.collections;
using bts.utils;
using mbts.spark.utilities;
using mbts.ui.extensions;
using mbts.ui.utility;
@@ -12,6 +11,7 @@ using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.ComponentModel;
using System.Globalization;
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
@@ -98,12 +98,16 @@ namespace mbts.ui.controls.color_picker {
// b) destroy and recreate color_vm without breaking TabControl bindings, and ICollectionView source dependencies
void _on_palettes_collection_changed(object sender, NotifyCollectionChangedEventArgs e) {
switch (e.Action) {
case NotifyCollectionChangedAction.Add: _color_vm.palettes.InsertRange(e.NewStartingIndex, e.NewItems); break;
case NotifyCollectionChangedAction.Add:
_color_vm.palettes.InsertRange(
e.NewStartingIndex, e.NewItems.Cast<ColorPaletteVM>());
break;
case NotifyCollectionChangedAction.Remove: _color_vm.palettes.RemoveRange(e.OldStartingIndex, e.OldItems.Count); break;
case NotifyCollectionChangedAction.Move: _color_vm.palettes.Move(e.OldStartingIndex, e.NewStartingIndex); break;
case NotifyCollectionChangedAction.Replace:
_color_vm.palettes.RemoveRange(e.OldStartingIndex, e.OldItems.Count);
_color_vm.palettes.InsertRange(e.NewStartingIndex, e.NewItems);
_color_vm.palettes.InsertRange(
e.NewStartingIndex, e.NewItems.Cast<ColorPaletteVM>());
break;
case NotifyCollectionChangedAction.Reset:
_color_vm.palettes.Clear();
@@ -10,6 +10,7 @@ namespace mbts.ui.controls {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using Spark.Core.Reflection;
using System;
@@ -7,6 +7,8 @@ using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -5,6 +5,8 @@ using bts.utils;
using mbts.utils;
using Spark.Core.Collections;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -1,10 +1,5 @@
using System.Collections.Generic;
using System.Collections.Specialized;
namespace Spark.Core.Collections {
using System.Collections.Generic;
namespace bts.collections {
interface IReadOnlyObservableCollection<out T> : IReadOnlyList<T>, IReadOnlyCollection<T>, INotifyCollectionChanged { }
interface IObservableCollection<T> : IList<T>, INotifyCollectionChanged { }
interface IObservableCollectionAddRemoveOnly<T> : ICollection<T>, IReadOnlyObservableCollection<T> {
new int Count { get; }
}
}
public interface IObservableCollection<T> : IList<T>, IReadOnlyObservableCollection<T> { }
}
@@ -0,0 +1,8 @@
#nullable enable
namespace Spark.Core.Collections {
using System.Collections.Generic;
public interface IObservableCollectionAddRemoveOnly<T> : ICollection<T>, IReadOnlyObservableCollection<T> {
new int Count { get; }
}
}
@@ -0,0 +1,7 @@
#nullable enable
namespace Spark.Core.Collections {
using System.Collections.Generic;
using System.Collections.Specialized;
public interface IReadOnlyObservableCollection<out T> : IReadOnlyList<T>, IReadOnlyCollection<T>, INotifyCollectionChanged { }
}
@@ -1,4 +1,5 @@
using Spark.Core;
using Spark.Core.Collections;
using System;
using System.Collections;