diff --git a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs index 089cbf1bc..733eb768b 100644 --- a/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs +++ b/src/client/spark/AW2/ViewModel/Graph/VolSurfaceGraphVM.cs @@ -12,7 +12,7 @@ namespace mbts.spark { using Spark.Analytics.View; using Spark.Core.Disposables; - using Spark.Core.Protobuf; + using Spark.Core.Reactive; using System; using System.Collections; diff --git a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceRowContextMenuVM.cs b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceRowContextMenuVM.cs index 17624cdac..c245bc15d 100644 --- a/src/client/spark/AW2/ViewModel/Grid/VolSurfaceRowContextMenuVM.cs +++ b/src/client/spark/AW2/ViewModel/Grid/VolSurfaceRowContextMenuVM.cs @@ -9,6 +9,7 @@ namespace mbts.spark { using mbts.ui.utility; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Admin/AdminModel.cs b/src/client/spark/Admin/AdminModel.cs index c37615654..c00b62e8c 100644 --- a/src/client/spark/Admin/AdminModel.cs +++ b/src/client/spark/Admin/AdminModel.cs @@ -6,6 +6,7 @@ using bts.collections; using bts.utils; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/AlgoProvider/IAlgoProvider.cs b/src/client/spark/AlgoProvider/IAlgoProvider.cs index 31f2bf5ab..5e6d48982 100644 --- a/src/client/spark/AlgoProvider/IAlgoProvider.cs +++ b/src/client/spark/AlgoProvider/IAlgoProvider.cs @@ -11,6 +11,7 @@ using mbts.utils; using Spark.Api.Orders; using Spark.Core; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs index d136bb730..1f9f36f20 100644 --- a/src/client/spark/Daemons/DeleteSyntheticDaemon.cs +++ b/src/client/spark/Daemons/DeleteSyntheticDaemon.cs @@ -6,6 +6,7 @@ using mbts.ui; using Spark.Api.Orders; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Daemons/FakeSlideDataDaemon.cs b/src/client/spark/Daemons/FakeSlideDataDaemon.cs index 0aa70152a..d5150b39b 100644 --- a/src/client/spark/Daemons/FakeSlideDataDaemon.cs +++ b/src/client/spark/Daemons/FakeSlideDataDaemon.cs @@ -8,6 +8,7 @@ namespace bts.daemons { using mbts.ui; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Daemons/GlobalAlertsDaemon.cs b/src/client/spark/Daemons/GlobalAlertsDaemon.cs index ec1c605d8..16d5c0f0a 100644 --- a/src/client/spark/Daemons/GlobalAlertsDaemon.cs +++ b/src/client/spark/Daemons/GlobalAlertsDaemon.cs @@ -9,6 +9,7 @@ using mbts.ui.spark; using mbts.ui.utilities; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Composition; diff --git a/src/client/spark/Daemons/MDDaemon.cs b/src/client/spark/Daemons/MDDaemon.cs index 4c43da753..43f27b40a 100644 --- a/src/client/spark/Daemons/MDDaemon.cs +++ b/src/client/spark/Daemons/MDDaemon.cs @@ -15,6 +15,7 @@ namespace bts { using Spark.Core.Data; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Concurrent; diff --git a/src/client/spark/Model/Trading/OrderDataSource.cs b/src/client/spark/Model/Trading/OrderDataSource.cs index 834f98538..7e2ff266b 100644 --- a/src/client/spark/Model/Trading/OrderDataSource.cs +++ b/src/client/spark/Model/Trading/OrderDataSource.cs @@ -11,6 +11,7 @@ namespace Spark.Model.Trading { using Spark.Api.Orders; using Spark.Api.Reactive; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Composition; diff --git a/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindowFactory.cs b/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindowFactory.cs index 2d3e7ae2a..45d2c9018 100644 --- a/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindowFactory.cs +++ b/src/client/spark/Modules/Analytics/VolSurface/VolSurfaceWindowFactory.cs @@ -4,6 +4,8 @@ namespace mbts.spark { using mbts.ui; + using Spark.Core.Reactive; + using System; using System.Reactive.Linq; using System.Threading.Tasks; diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 4b38acd7a..c25ddc215 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -23,6 +23,7 @@ namespace mbts.spark { using Spark.Core.Data; using Spark.Core.Disposables; using Spark.Core.Reflection; + using Spark.Core.Reactive; using Spark.Trading; using System; diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 2f9cbb4f2..a1d6f9b66 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -18,6 +18,7 @@ using mbts.utils; using Spark.Core; using Spark.Core.Data; using Spark.Core.Disposables; +using Spark.Core.Reactive; using Spark.Trading; using System; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index abd68a07c..d4248f9a8 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -16,6 +16,7 @@ using mbts.utils; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Spreader/SpreaderModel.cs b/src/client/spark/Modules/Spreader/SpreaderModel.cs index c925b2301..a41e84a86 100644 --- a/src/client/spark/Modules/Spreader/SpreaderModel.cs +++ b/src/client/spark/Modules/Spreader/SpreaderModel.cs @@ -8,6 +8,7 @@ using bts.spark; using mbts.utils; using Spark.Core; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index 3165cbf6c..e463ff90a 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -13,6 +13,7 @@ using mbts.ui.utility; using mbts.utils; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs index 92a2ea2ab..5387b412d 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/AlgoStudioWindow.cs @@ -7,6 +7,7 @@ using mbts.ui.spark; using mbts.utils; using Spark.Core.Disposables; +using Spark.Core.Reactive; using Spark.ViewModel.Commands; using System; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs index af8bd98f0..e62390a04 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoStudioFlatDefinitionModel.cs @@ -6,6 +6,7 @@ using bts.spark; using mbts.utils; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 5f916b221..74184dd08 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -16,6 +16,7 @@ using Spark.Api.Orders; using Spark.Core; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs index 8cf61d284..0cf75ee5e 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoStudioVM.cs @@ -14,6 +14,7 @@ using mbts.utils; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using Spark.ViewModel.Commands; using System; diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs index c9ef20589..f7ccd2c93 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs @@ -6,6 +6,7 @@ using mbts.utils; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.ObjectModel; diff --git a/src/client/spark/Modules/Trading/Ladder/FairValueModel.cs b/src/client/spark/Modules/Trading/Ladder/FairValueModel.cs index 252361314..ce89b5b93 100644 --- a/src/client/spark/Modules/Trading/Ladder/FairValueModel.cs +++ b/src/client/spark/Modules/Trading/Ladder/FairValueModel.cs @@ -7,6 +7,7 @@ namespace Spark.Trading { using mbts.spark; using Spark.Api.MarketData; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index 4e202def8..8c094612b 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -14,6 +14,7 @@ using Spark.Core.Data; using Spark.Core.Disposables; + using Spark.Core.Reactive; using Spark.Trading; using System; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/FairValueLineVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/FairValueLineVM.cs index 8cb2e79c2..7223569bd 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/FairValueLineVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/FairValueLineVM.cs @@ -5,6 +5,7 @@ namespace mbts.spark { using mbts.ui.shell; using Spark.Core.Disposables; + using Spark.Core.Reactive; using Spark.Trading; using System; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 3463a77f0..3eb229555 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -23,6 +23,7 @@ namespace mbts.spark { using Spark.Core.Collections; using Spark.Core.Data; using Spark.Core.Disposables; + using Spark.Core.Reactive; using Spark.Trading; using Spark.ViewModel.Commands; using Spark.ViewModel.Trading; diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsWindow.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsWindow.cs index 32ce77faf..60bccd243 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsWindow.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsWindow.cs @@ -14,6 +14,7 @@ namespace Spark.Trading { using Spark.Core.Data; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 152441a5b..60aaee492 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -23,6 +23,7 @@ using Spark.Api.Orders; using Spark.Core.Collections; using Spark.Core.Data; using Spark.Core.Disposables; +using Spark.Core.Reactive; using Spark.Trading; using Spark.ViewModel.Commands; diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs index 9d8e5d5c3..2f449beb9 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs @@ -13,6 +13,7 @@ using mbts.utils; using Spark.Api.Orders; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index e3cfe430c..71410149d 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -481,7 +481,7 @@ namespace bts.shell.pnl { switch (header) { case PNLHeaderRowDisplay.SelectedTotal: // throttle selection changes (they have a potentially high frequency) - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( + var filter_src = Spark.Core.Reactive.ObservableExtensions.FromEventThrottle>( cb => _selection_changed += cb, cb => _selection_changed -= cb, _ => _mk_selected_items_filter(_fill_pnl_key_fn), @@ -503,7 +503,7 @@ namespace bts.shell.pnl { switch (header) { case PNLHeaderRowDisplay.SelectedTotal: // throttle selection changes (they have a potentially high frequency) - var filter_src = System.Reactive.Linq.ObservableExtensions.FromEventThrottle>( + var filter_src = Spark.Core.Reactive.ObservableExtensions.FromEventThrottle>( cb => _selection_changed += cb, cb => _selection_changed -= cb, _ => _mk_selected_items_filter(_order_pnl_key_fn), diff --git a/src/client/spark/Notifications/INotificationService.cs b/src/client/spark/Notifications/INotificationService.cs index cd30d493d..9f3d23ddb 100644 --- a/src/client/spark/Notifications/INotificationService.cs +++ b/src/client/spark/Notifications/INotificationService.cs @@ -13,6 +13,7 @@ using mbts.utils; using Spark.Api.Orders; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index d55580c0c..52546cd9a 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -15,6 +15,7 @@ using mbts.utils; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using Spark.ViewModel.Commands; using System; @@ -150,11 +151,11 @@ namespace mbts.spark { save_definition_cmd = new AsyncCommand(save_definition_async); undo_definition_cmd = ObservantCommand.create( d => d?.undo(), - d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(), + d => d == null ? Observable.Return(false) : Spark.Core.Reactive.ObservableExtensions.FromEvent(cb => d.can_undo_changed += cb, cb => d.can_undo_changed -= cb, () => d.can_undo).OnDispatcher(), out IObserver undo_definition_observer); redo_definition_cmd = ObservantCommand.create( d => d?.redo(), - d => d == null ? Observable.Return(false) : System.Reactive.Linq.ObservableExtensions.FromEvent(cb => d.can_redo_changed += cb, cb => d.can_redo_changed -= cb, () => d.can_redo).OnDispatcher(), + d => d == null ? Observable.Return(false) : Spark.Core.Reactive.ObservableExtensions.FromEvent(cb => d.can_redo_changed += cb, cb => d.can_redo_changed -= cb, () => d.can_redo).OnDispatcher(), out IObserver redo_definition_observer); revert_definition_cmd = ObservantCommand.create( d => d.load_committed(), diff --git a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs index ac0b41058..a15d11f13 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IOrderTypeVM.cs @@ -11,6 +11,7 @@ using mbts.utils; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs index 882cb55fe..24a1cc73c 100644 --- a/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs +++ b/src/client/spark/Orders/OrderTypeVMs/OrderTypeVMFactory.cs @@ -18,6 +18,7 @@ using Spark.Api.Orders; using Spark.Core; using Spark.Core.Collections; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Risk/Combo/ComboReportCalculator.cs b/src/client/spark/Risk/Combo/ComboReportCalculator.cs index 252bf9d29..b15c3d02d 100644 --- a/src/client/spark/Risk/Combo/ComboReportCalculator.cs +++ b/src/client/spark/Risk/Combo/ComboReportCalculator.cs @@ -10,6 +10,7 @@ namespace mbts.analytics { using Microsoft.VisualStudio.TestPlatform.Utilities; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/Risk/PNL/PNLReportCalculator.cs b/src/client/spark/Risk/PNL/PNLReportCalculator.cs index 902208655..a5fc523a8 100644 --- a/src/client/spark/Risk/PNL/PNLReportCalculator.cs +++ b/src/client/spark/Risk/PNL/PNLReportCalculator.cs @@ -9,6 +9,7 @@ using bts; using System.Reactive.Linq; using BCG; using Spark.Core.Disposables; +using Spark.Core.Reactive; namespace mbts.analytics { diff --git a/src/client/spark/Risk/Slide/SlideReportCalculator.cs b/src/client/spark/Risk/Slide/SlideReportCalculator.cs index 966caab9e..8304c6a3f 100644 --- a/src/client/spark/Risk/Slide/SlideReportCalculator.cs +++ b/src/client/spark/Risk/Slide/SlideReportCalculator.cs @@ -15,6 +15,7 @@ using bts.collections; using BCG; using Spark.Core.Disposables; +using Spark.Core.Reactive; using SlideTags = mbts.spark.SparkTags.ReportBlackboardTags.Slide; diff --git a/src/client/spark/core/ShellInterface/ShellWindowBase.cs b/src/client/spark/core/ShellInterface/ShellWindowBase.cs index 1030c0fb9..5ff44f7f4 100644 --- a/src/client/spark/core/ShellInterface/ShellWindowBase.cs +++ b/src/client/spark/core/ShellInterface/ShellWindowBase.cs @@ -6,6 +6,7 @@ namespace mbts.ui { using mbts.ui.shell; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark/core/Utility/ProtoBufDictionaryServer/IDictionaryServer.cs b/src/client/spark/core/Utility/ProtoBufDictionaryServer/IDictionaryServer.cs index 2571960e4..6f78824d4 100644 --- a/src/client/spark/core/Utility/ProtoBufDictionaryServer/IDictionaryServer.cs +++ b/src/client/spark/core/Utility/ProtoBufDictionaryServer/IDictionaryServer.cs @@ -1,4 +1,6 @@ -using System; +using Spark.Core.Reactive; + +using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateFavoriteButtonsView.xaml.cs b/src/client/spark/view/Controls/Order/AlgoTemplateFavoriteButtonsView.xaml.cs index 75f06e56f..d56014072 100644 --- a/src/client/spark/view/Controls/Order/AlgoTemplateFavoriteButtonsView.xaml.cs +++ b/src/client/spark/view/Controls/Order/AlgoTemplateFavoriteButtonsView.xaml.cs @@ -1,6 +1,7 @@ using mbts.ui.utilities; using Spark.Core.Disposables; +using Spark.Core.Reactive; using System; using System.Collections; @@ -26,7 +27,7 @@ namespace mbts.ui.spark.algo { DefaultStyleKeyProperty.OverrideMetadata(typeof(AlgoTemplateFavoriteButtonsView), new FrameworkPropertyMetadata(typeof(AlgoTemplateFavoriteButtonsView))); public AlgoTemplateFavoriteButtonsView() => - System.Reactive.Linq.ObservableExtensions.FromAction(_items_source_changed) + Spark.Core.Reactive.ObservableExtensions.FromAction(_items_source_changed) .SubscribeEach(items_source => items_source is null ? Disposable.empty : items_source.Subscribe(_on_items_source_CollectionChanged)); diff --git a/src/client/spark/view/Spark/Core/SparkUtils.cs b/src/client/spark/view/Spark/Core/SparkUtils.cs index d5a057d17..ca576fd96 100644 --- a/src/client/spark/view/Spark/Core/SparkUtils.cs +++ b/src/client/spark/view/Spark/Core/SparkUtils.cs @@ -4,6 +4,8 @@ using bts.api.core; using mbts.ui; +using Spark.Core.Reactive; + using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/src/client/spark_api/Admin/AdminClient.cs b/src/client/spark_api/Admin/AdminClient.cs index c5b6b6cc5..f335059cd 100644 --- a/src/client/spark_api/Admin/AdminClient.cs +++ b/src/client/spark_api/Admin/AdminClient.cs @@ -6,6 +6,7 @@ namespace Spark.Api.Admin { using bts.utils; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark_api/MarketData/TradesSource.cs b/src/client/spark_api/MarketData/TradesSource.cs index f02af36e5..77789e16c 100644 --- a/src/client/spark_api/MarketData/TradesSource.cs +++ b/src/client/spark_api/MarketData/TradesSource.cs @@ -9,6 +9,7 @@ using mbts.co2; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark_api/Orders/OrdersClient.cs b/src/client/spark_api/Orders/OrdersClient.cs index c213bfec5..e64a562ff 100644 --- a/src/client/spark_api/Orders/OrdersClient.cs +++ b/src/client/spark_api/Orders/OrdersClient.cs @@ -11,6 +11,7 @@ namespace Spark.Api.Orders { using Spark.Api.Admin; using Spark.Api.Reactive; using Spark.Core.Disposables; + using Spark.Core.Reactive; using System; using System.Reactive.Concurrency; diff --git a/src/client/spark_api_server/BookDumper.cs b/src/client/spark_api_server/BookDumper.cs index 6cd1d4e92..6fab3aeca 100644 --- a/src/client/spark_api_server/BookDumper.cs +++ b/src/client/spark_api_server/BookDumper.cs @@ -9,6 +9,7 @@ namespace spark_api_server { using Spark.Api.MarketData; using Spark.Api.Server; using Spark.Core; + using Spark.Core.Reactive; using System; using System.Collections.Generic; diff --git a/src/client/spark_api_server/SecurityDumper.cs b/src/client/spark_api_server/SecurityDumper.cs index baaaf4d0e..6a9c45187 100644 --- a/src/client/spark_api_server/SecurityDumper.cs +++ b/src/client/spark_api_server/SecurityDumper.cs @@ -7,6 +7,7 @@ namespace spark_api_server { using mbts.spark; using Spark.Api.Server; + using Spark.Core.Reactive; using System; using System.Linq; diff --git a/src/client/spark_core/utils/ObservableExtensions.cs b/src/client/spark_core/Reactive/ObservableExtensions.cs similarity index 98% rename from src/client/spark_core/utils/ObservableExtensions.cs rename to src/client/spark_core/Reactive/ObservableExtensions.cs index b151347b8..f292c7114 100644 --- a/src/client/spark_core/utils/ObservableExtensions.cs +++ b/src/client/spark_core/Reactive/ObservableExtensions.cs @@ -1,12 +1,14 @@ -using Spark.Core; -using Spark.Core.Disposables; -using Spark.Core.Reactive; +namespace Spark.Core.Reactive { + using Spark.Core.Disposables; + using Spark.Core.Reactive; -using System.Reactive.Subjects; -using System.Threading; -using System.Threading.Tasks; + using System; + using System.Reactive; + using System.Reactive.Linq; + using System.Reactive.Subjects; + using System.Threading; + using System.Threading.Tasks; -namespace System.Reactive.Linq { public static class ObservableExtensions { public static IObservable And(this IObservable source1, IObservable source2) => source1.CombineLatest(source2).Select(tup => tup.Item1 && tup.Item2);