From 8d263cdd370e12bfeea04f4c683112ea4e05e970 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 12 Apr 2019 13:21:17 -0500 Subject: [PATCH] remove redundant 'SubscribeHookLatest' method, redirect callers to 'SubscribeEach' --- .../Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 4 ++-- .../View/AlgoEditorGridView/AlgoParamRowsHelper.cs | 6 +++--- .../spark/core/GlobalExtensions/GlobalExtensions.cs | 8 -------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 8f268e9a7..1ead90269 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -129,7 +129,7 @@ namespace mbts.spark { as_demuxer().subscribe_many(_refresh_on_local_changes.execute, nameof(this.name), nameof(abbreviation), nameof(badge_fill)), _edit_pane_vs_model.add_source(VisualStateNames.BadgeSelector.GroupName, custom_badge_color.observe_nullable(true).Select(t => t.HasValue ? VisualStateNames.BadgeSelector.Active : VisualStateNames.BadgeSelector.Inactive)), _edit_pane_vs_model.add_source(VisualStateNames.Abbreviation.GroupName, _abbreviation.observe_current(true).Select(a => string.IsNullOrEmpty(a) ? VisualStateNames.Abbreviation.Unpopulated : VisualStateNames.Abbreviation.Populated)), - _algo_root.observe_current(true).SubscribeHookLatest(vm => { + _algo_root.observe_current(true).SubscribeEach(vm => { if (vm == null) return Disposable.empty; if (vm is ILazyAlgo la) { @@ -169,7 +169,7 @@ namespace mbts.spark { } var permission_src = _permissions_mask.observe_result(); resources.Add(_selected_format.observe_current(true).CombineLatest(permission_src, (fmt, perms) => (fmt, perms)) - .SubscribeHookLatest(t => { + .SubscribeEach(t => { if ((t.perms & AlgoEditingPermissions.AllowEditStructure) != 0) { using (_refresh_on_local_changes.defer_execution()) { var algo_data = model.factory.default_algos(t.fmt); 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 0e59a428a..6764415b8 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs @@ -9,7 +9,7 @@ using System.Reactive.Disposables; namespace mbts.spark { static class AlgoParamRowsHelper { public static IDisposable connect(AlgoDefinitionVM algo, ObservableAggregateCollection rows, bool include_algo_type_rows) => - algo == null ? null : new CompositeDisposable(algo.observe_algo_root().SubscribeHookLatest(a => { + algo == null ? null : new CompositeDisposable(algo.observe_algo_root().SubscribeEach(a => { rows.clear_collections(); if (a == null) return Disposable.empty; @@ -49,7 +49,7 @@ namespace mbts.spark { } else { algo_params = rows; } - return algo_def.observe_algo_root().SubscribeHookLatest(a => { + return algo_def.observe_algo_root().SubscribeEach(a => { algo_params.clear_collections(); if (a == null) return Disposable.empty; @@ -76,7 +76,7 @@ namespace mbts.spark { include_algo_type_rows ? (ObservableCollection)new ObservableAppendCollection(child_rows, selector_wrapper) : child_rows, - s.subscribe_selected_algo().SubscribeHookLatest(a => { + s.subscribe_selected_algo().SubscribeEach(a => { s.value = a; child_rows.clear_collections(); return _wrap_rows(a, selector_wrapper, child_rows, include_algo_type_rows); diff --git a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs index 83ad850a9..6604f1f94 100644 --- a/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GlobalExtensions.cs @@ -321,14 +321,6 @@ namespace System.Reactive.Linq { return source.Subscribe(o); }); - public static IDisposable SubscribeHookLatest(this IObservable source, Func get_hook) { - IDisposable latest_hook = null; - return new Disposables.CompositeDisposable( - source.Subscribe(v => Disposable.replace(ref latest_hook, get_hook(v)))) { - () => Disposable.dispose(ref latest_hook) - }; - } - public static IObservable FromEvent(Action add_handler, Action remove_handler, Func selector) => Observable.Create(o => { callback();