diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index d93ae0dbf..a61249130 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -58,7 +58,7 @@ namespace mbts.spark { var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name); _commands = new List { SparkCommands.ShowLadders.complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0), - SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.current_security_md, md => md.HasValue, ObjectHelper.ValueOrDefault), + SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.current_security_md, md => md.HasValue, ConvertUtils.ValueOrDefault), SparkCommands.ShowFills.complete(_vm.selected_securities_observable(), _ => true, secs => new FillsWindowFactory.StartupData(new FillsWindowFactory.FilterStates { security = secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 37d4a4415..db3d90230 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -62,8 +62,8 @@ namespace mbts.spark { var current_smd_source = connectable_builder.create(vm => vm.current_security_md_observable(_bus)).OnDispatcher(); var selected_secs_source = connectable_builder.create(vm => vm.selected_securities_observable()).OnDispatcher(); _commands = new SparkCommand[] { - SparkCommands.ShowLadder.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault), - SparkCommands.ShowOrderTicketFromSecurity.complete(current_smd_source, md => md.HasValue, ObjectHelper.ValueOrDefault), + SparkCommands.ShowLadder.complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault), + SparkCommands.ShowOrderTicketFromSecurity.complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault), SparkCommands.ShowFills.complete(selected_secs_source, always_true, get_fills_startup_data), SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria), SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index d7efda3eb..211c93b91 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -55,7 +55,7 @@ namespace mbts.spark { current_row_connectable_builder.create(observe_row_strategy), rs => rs.HasValue, select_row_strategy_tuple ), SparkCommands.ShowLadder.complete( - vm_connectable_builder.create(vm => vm.current_security_md), md => md.HasValue, ObjectHelper.ValueOrDefault + vm_connectable_builder.create(vm => vm.current_security_md), md => md.HasValue, ConvertUtils.ValueOrDefault ), SparkCommands.ShowOrders.complete(() => new OrderBookWindowFactory.OrderBookStartupData { filters = new OrderBookWindowFactory.FilterStates { security_criteria = new SecurityCriteria(_vm.value.row_vms.Select(r => r.security)) diff --git a/src/client/spark/core/Commands/AsyncCommand.cs b/src/client/spark/core/Commands/AsyncCommand.cs index c0afedc5b..f70531eed 100644 --- a/src/client/spark/core/Commands/AsyncCommand.cs +++ b/src/client/spark/core/Commands/AsyncCommand.cs @@ -42,7 +42,7 @@ namespace mbts.ui { public bool CanExecute(object parameter) { if (!allow_concurrent_executions && _n_executing > 0) return false; - else return _can_execute(ObjectHelper.try_convert(parameter)); + else return _can_execute(ConvertUtils.try_convert(parameter)); } public async Task Execute(object parameter) { @@ -51,7 +51,7 @@ namespace mbts.ui { if (!allow_concurrent_executions) RaiseCanExecuteChanged(); } - await _execute(ObjectHelper.try_convert(parameter)); + await _execute(ConvertUtils.try_convert(parameter)); if (--_n_executing == 0) { _raise_is_executing_changed(); if (!allow_concurrent_executions) diff --git a/src/client/spark/core/Commands/DelegateCommand.cs b/src/client/spark/core/Commands/DelegateCommand.cs index 1fa8a66eb..6e4ae58b2 100644 --- a/src/client/spark/core/Commands/DelegateCommand.cs +++ b/src/client/spark/core/Commands/DelegateCommand.cs @@ -27,13 +27,13 @@ namespace mbts.ui if (_can_execute == null) return true; else - return _can_execute(ObjectHelper.try_convert(parameter)); + return _can_execute(ConvertUtils.try_convert(parameter)); } public event EventHandler CanExecuteChanged; public void Execute(object parameter) => - _execute(ObjectHelper.try_convert(parameter)); + _execute(ConvertUtils.try_convert(parameter)); } public class DelegateCommand : DelegateCommand { diff --git a/src/client/spark/core/Commands/ObservantCommand.cs b/src/client/spark/core/Commands/ObservantCommand.cs index 02b3eb458..d0880556f 100644 --- a/src/client/spark/core/Commands/ObservantCommand.cs +++ b/src/client/spark/core/Commands/ObservantCommand.cs @@ -12,7 +12,7 @@ namespace mbts.ui { public event EventHandler CanExecuteChanged; public bool CanExecute(object parameter) => _can_execute; - public void Execute(object parameter) => _execute(ObjectHelper.try_convert(parameter)); + public void Execute(object parameter) => _execute(ConvertUtils.try_convert(parameter)); public void OnCompleted() { } public void OnError(Exception error) { } diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index 33111b93e..4643be5cd 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -364,7 +364,7 @@ namespace System.Collections.Generic { } /// - /// Uses to convert the elements of an to the specified type. + /// Uses to convert the elements of an to the specified type. /// /// The type to convert the elements of source to. /// The that contains the elements to be cast to type @@ -373,7 +373,7 @@ namespace System.Collections.Generic { public static IEnumerable convert(this IEnumerable source) { ExceptionAssert.Argument.NotNull(source, nameof(source)); foreach (object obj in source) - yield return ObjectHelper.try_convert(obj); + yield return ConvertUtils.try_convert(obj); } } diff --git a/src/client/spark/view/Controls/Badge.cs b/src/client/spark/view/Controls/Badge.cs index 978b44fd1..6e5ec4f96 100644 --- a/src/client/spark/view/Controls/Badge.cs +++ b/src/client/spark/view/Controls/Badge.cs @@ -348,7 +348,7 @@ namespace mbts.ui.controls { class BadgeTextLinesConverter : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - if (ObjectHelper.try_convert_args(values, out Side side, out uint quantity, out uint filled, out mbts.spark.LadderSettings.BadgeStyle style)) + if (ConvertUtils.try_convert_args(values, out Side side, out uint quantity, out uint filled, out mbts.spark.LadderSettings.BadgeStyle style)) return BadgeRender.format(side, quantity, filled, style); else return new string[0]; } diff --git a/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml.cs b/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml.cs index c5681bd77..db611cbcc 100644 --- a/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml.cs +++ b/src/client/spark/view/Controls/ColorPicker/ColorPickerControl.xaml.cs @@ -218,7 +218,7 @@ namespace mbts.ui.controls.color_picker { public DataTemplate EditableTemplate { get; set; } public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - if (ObjectHelper.try_convert_args(values, out ColorPaletteVM vm, out bool is_selected)) { + if (ConvertUtils.try_convert_args(values, out ColorPaletteVM vm, out bool is_selected)) { if (vm.can_user_edit && is_selected) return EditableTemplate; } diff --git a/src/client/spark/view/Controls/ColorPicker/ColorPickerSwatch.xaml.cs b/src/client/spark/view/Controls/ColorPicker/ColorPickerSwatch.xaml.cs index e0badf823..8b2645d72 100644 --- a/src/client/spark/view/Controls/ColorPicker/ColorPickerSwatch.xaml.cs +++ b/src/client/spark/view/Controls/ColorPicker/ColorPickerSwatch.xaml.cs @@ -38,7 +38,7 @@ namespace mbts.ui.controls.color_picker { class NamedColorItemToolTipConverter : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) => - ObjectHelper.try_convert_args(values, out string name, out bool can_user_edit) ? + ConvertUtils.try_convert_args(values, out string name, out bool can_user_edit) ? $"{name} (Alt + Click for info{(can_user_edit ? ", Ctrl + Click to assign" : string.Empty)})" : string.Empty; diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs index 87d3af6b7..36ff8989a 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs @@ -109,6 +109,6 @@ namespace mbts.spark.filters { protected virtual void _validate() { } bool IDataGridColumnFilter.filter(object row) => - filter(ObjectHelper.try_convert(row)); + filter(ConvertUtils.try_convert(row)); } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs index 796fc455f..c0be31570 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TupleFilterVM.cs @@ -70,6 +70,6 @@ namespace mbts.spark.filters { bool IDataGridColumnFilter.filter(object row) => - filter(ObjectHelper.try_convert(row)); + filter(ConvertUtils.try_convert(row)); } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DataGridEx/Model/DataGridExModel.cs b/src/client/spark/view/Controls/DataGridEx/Model/DataGridExModel.cs index ffc6da5bb..14ed984e3 100644 --- a/src/client/spark/view/Controls/DataGridEx/Model/DataGridExModel.cs +++ b/src/client/spark/view/Controls/DataGridEx/Model/DataGridExModel.cs @@ -52,7 +52,7 @@ namespace mbts.ui.controls protected DataGridExRow() { } public abstract object get_cell(TColKey col_key); - public object get_cell(object col_key) { return get_cell(ObjectHelper.try_convert(col_key)); } + public object get_cell(object col_key) { return get_cell(ConvertUtils.try_convert(col_key)); } } @@ -60,6 +60,6 @@ namespace mbts.ui.controls public abstract class DataGridExCell : ViewModelBase, IDataGridExCell, IDataGridExCell { public abstract void update(TData data); - public void update(object data) { update(ObjectHelper.try_convert(data)); } + public void update(object data) { update(ConvertUtils.try_convert(data)); } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/FontPicker/FontPicker.xaml.cs b/src/client/spark/view/Controls/FontPicker/FontPicker.xaml.cs index 88c4dcac0..5c7a3b0cd 100644 --- a/src/client/spark/view/Controls/FontPicker/FontPicker.xaml.cs +++ b/src/client/spark/view/Controls/FontPicker/FontPicker.xaml.cs @@ -77,7 +77,7 @@ namespace mbts.ui.controls { class FontFamilySupportsWeightConverter : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - if (ObjectHelper.try_convert_args(values, out FontFamily ff, out FontWeight fw)) + if (ConvertUtils.try_convert_args(values, out FontFamily ff, out FontWeight fw)) return TextUtils.available_weights(ff).Contains(fw); return false; } diff --git a/src/client/spark/view/Converters/AnonymousValueConverter.cs b/src/client/spark/view/Converters/AnonymousValueConverter.cs index 10882f471..28b8ad002 100644 --- a/src/client/spark/view/Converters/AnonymousValueConverter.cs +++ b/src/client/spark/view/Converters/AnonymousValueConverter.cs @@ -37,8 +37,8 @@ namespace mbts.ui.converters { private readonly Func _convert; private readonly Func _convert_back; - public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { return _convert(ObjectHelper.try_convert(value)); } - public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { return _convert_back(ObjectHelper.try_convert(value)); } + public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { return _convert(ConvertUtils.try_convert(value)); } + public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { return _convert_back(ConvertUtils.try_convert(value)); } } public class AnonymousMultiValueConverter : IMultiValueConverter { @@ -49,7 +49,7 @@ namespace mbts.ui.converters { public TOut ErrorValue { get; set; } public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) => - ObjectHelper.try_convert_args(values, out TIn1 a, out TIn2 b) ? _convert(a, b) : ErrorValue; + ConvertUtils.try_convert_args(values, out TIn1 a, out TIn2 b) ? _convert(a, b) : ErrorValue; public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } @@ -62,7 +62,7 @@ namespace mbts.ui.converters { public TOut ErrorValue { get; set; } public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) => - ObjectHelper.try_convert_args(values, out TIn1 a, out TIn2 b, out TIn3 c) ? _convert(a, b, c) : ErrorValue; + ConvertUtils.try_convert_args(values, out TIn1 a, out TIn2 b, out TIn3 c) ? _convert(a, b, c) : ErrorValue; public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); } diff --git a/src/client/spark/view/Converters/Boolean/DynamicValueEquals.cs b/src/client/spark/view/Converters/Boolean/DynamicValueEquals.cs index 112d4970e..62ddcbb47 100644 --- a/src/client/spark/view/Converters/Boolean/DynamicValueEquals.cs +++ b/src/client/spark/view/Converters/Boolean/DynamicValueEquals.cs @@ -19,7 +19,7 @@ namespace mbts.ui.converters } public class DynamicValueEquals : DynamicValueEquals { - protected override bool ValuesEqual(object x, object y) { return ObjectHelper.try_convert(x, out T tx) && ObjectHelper.try_convert(y, out T ty) && ValuesEqual(tx, ty); } + protected override bool ValuesEqual(object x, object y) { return ConvertUtils.try_convert(x, out T tx) && ConvertUtils.try_convert(y, out T ty) && ValuesEqual(tx, ty); } protected virtual bool ValuesEqual(T x, T y) { return CompareUtils.NullCheckEquals(x, y); } } } \ No newline at end of file diff --git a/src/client/spark/view/Converters/Boolean/StaticValueEqualsConverter.cs b/src/client/spark/view/Converters/Boolean/StaticValueEqualsConverter.cs index 97fde92b6..483266ea2 100644 --- a/src/client/spark/view/Converters/Boolean/StaticValueEqualsConverter.cs +++ b/src/client/spark/view/Converters/Boolean/StaticValueEqualsConverter.cs @@ -12,7 +12,7 @@ namespace mbts.ui.converters } public class StaticValueEqualsConverter : StaticValueEqualsConverter { - protected override bool ValueEquals(object value) { return ObjectHelper.try_convert(value, out T result) && ValueEquals(result); } + protected override bool ValueEquals(object value) { return ConvertUtils.try_convert(value, out T result) && ValueEquals(result); } protected virtual bool ValueEquals(T value) { return base.ValueEquals(value); } } } \ No newline at end of file diff --git a/src/client/spark/view/Extensions/Command/AsyncDialogCommand.cs b/src/client/spark/view/Extensions/Command/AsyncDialogCommand.cs index c20424db2..05d4100cd 100644 --- a/src/client/spark/view/Extensions/Command/AsyncDialogCommand.cs +++ b/src/client/spark/view/Extensions/Command/AsyncDialogCommand.cs @@ -32,7 +32,7 @@ namespace mbts.ui public event EventHandler CanExecuteChanged; public bool CanExecute(object parameter) { - return !_is_executing && (_can_execute == null || _can_execute(ObjectHelper.try_convert(parameter))); + return !_is_executing && (_can_execute == null || _can_execute(ConvertUtils.try_convert(parameter))); } public void RaiseCanExecuteChanged() { @@ -45,7 +45,7 @@ namespace mbts.ui _is_executing = true; RaiseCanExecuteChanged(); try { - var w = await _factory(ObjectHelper.try_convert(parameter)); + var w = await _factory(ConvertUtils.try_convert(parameter)); if (w != null) { if (_off_x.HasValue && _off_y.HasValue) w.move_to_mouse(_off_x.Value, _off_x.Value); diff --git a/src/client/spark/view/Extensions/Command/DialogCommand.cs b/src/client/spark/view/Extensions/Command/DialogCommand.cs index 27a5f78bf..e5a9e8611 100644 --- a/src/client/spark/view/Extensions/Command/DialogCommand.cs +++ b/src/client/spark/view/Extensions/Command/DialogCommand.cs @@ -28,12 +28,12 @@ namespace mbts.ui private IDisposable _dialog; public Predicate can_execute { get; set; } - public bool CanExecute(object parameter) { return can_execute == null ? true : can_execute(ObjectHelper.try_convert(parameter)); } + public bool CanExecute(object parameter) { return can_execute == null ? true : can_execute(ConvertUtils.try_convert(parameter)); } public event EventHandler CanExecuteChanged; public void Execute(object parameter) { Disposable.dispose(ref _dialog); - Window w = _factory(ObjectHelper.try_convert(parameter)); + Window w = _factory(ConvertUtils.try_convert(parameter)); if (w != null) { if (_try_dispose_vm_on_close) { w.Closed += (s, e) => { diff --git a/src/client/spark/view/Extensions/Command/FileDialogCommand.cs b/src/client/spark/view/Extensions/Command/FileDialogCommand.cs index 6e52b47cd..e6b4c911b 100644 --- a/src/client/spark/view/Extensions/Command/FileDialogCommand.cs +++ b/src/client/spark/view/Extensions/Command/FileDialogCommand.cs @@ -101,10 +101,10 @@ namespace mbts.ui { public event EventHandler CanExecuteChanged; - public bool CanExecute(object parameter) => _can_execute(ObjectHelper.try_convert(parameter)); + public bool CanExecute(object parameter) => _can_execute(ConvertUtils.try_convert(parameter)); public void Execute(object parameter) { _safe_close_dialog(); - TParam tparam = ObjectHelper.try_convert(parameter); + TParam tparam = ConvertUtils.try_convert(parameter); _dialog = _dialog_factory(tparam); if (_dialog.ShowDialog() == DialogResult.OK) _commit(tparam, _dialog.FileName); diff --git a/src/client/spark/view/Extensions/WPFExtensions.cs b/src/client/spark/view/Extensions/WPFExtensions.cs index 127405dc1..d9ed318d7 100644 --- a/src/client/spark/view/Extensions/WPFExtensions.cs +++ b/src/client/spark/view/Extensions/WPFExtensions.cs @@ -24,7 +24,7 @@ namespace mbts.ui { public static T get_template_child(this Control control, string name) { object obj = get_template_child(control, name); - return ObjectHelper.try_convert(obj); + return ConvertUtils.try_convert(obj); } public static bool try_get_template_child(this Control control, string name, out object result) { @@ -40,7 +40,7 @@ namespace mbts.ui { public static bool try_get_template_child(this Control control, string name, out T result) { if (try_get_template_child(control, name, out object obj)) - return ObjectHelper.try_convert(obj, out result); + return ConvertUtils.try_convert(obj, out result); result = default; return false; } diff --git a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs index aceefbcf8..bd9f61f64 100644 --- a/src/client/spark/view/Spark/Ladder/LadderGridHost.cs +++ b/src/client/spark/view/Spark/Ladder/LadderGridHost.cs @@ -853,11 +853,11 @@ namespace mbts.spark { LadderSettings _settings => _owner._settings; public void refresh() { - bid_dirty = ObjectHelper.update_value_type(ref _bid, _settings.bid_break_line.show ? _owner._get_bid_market_break() : double.NaN); - ask_dirty = ObjectHelper.update_value_type(ref _ask, _settings.ask_break_line.show ? _owner._get_ask_market_break() : double.NaN); - mid_dirty = ObjectHelper.update_value_type(ref _mid, _settings.mid_break_line.show ? _owner._get_mid_market_break() : double.NaN); - session_low_dirty = ObjectHelper.update_value_type(ref _session_low, (_settings.session_low_line.show || _settings.session_range_fill.show) ? _owner._get_session_low() : double.NaN); - session_high_dirty = ObjectHelper.update_value_type(ref _session_high, (_settings.session_high_line.show || _settings.session_range_fill.show) ? _owner._get_session_high() : double.NaN); + bid_dirty = ConvertUtils.update_value_type(ref _bid, _settings.bid_break_line.show ? _owner._get_bid_market_break() : double.NaN); + ask_dirty = ConvertUtils.update_value_type(ref _ask, _settings.ask_break_line.show ? _owner._get_ask_market_break() : double.NaN); + mid_dirty = ConvertUtils.update_value_type(ref _mid, _settings.mid_break_line.show ? _owner._get_mid_market_break() : double.NaN); + session_low_dirty = ConvertUtils.update_value_type(ref _session_low, (_settings.session_low_line.show || _settings.session_range_fill.show) ? _owner._get_session_low() : double.NaN); + session_high_dirty = ConvertUtils.update_value_type(ref _session_high, (_settings.session_high_line.show || _settings.session_range_fill.show) ? _owner._get_session_high() : double.NaN); if (session_low_dirty) _low_index = null; if (session_high_dirty) @@ -871,7 +871,7 @@ namespace mbts.spark { else new_origin = mid; if (double.IsNaN(new_origin)) new_origin = _owner._get_bid_market_break(); - origin_dirty = ObjectHelper.update_value_type(ref _origin, new_origin); + origin_dirty = ConvertUtils.update_value_type(ref _origin, new_origin); } } } diff --git a/src/client/spark/view/Utility/WPFHelper.cs b/src/client/spark/view/Utility/WPFHelper.cs index 275ac1ea2..eb350fc7f 100644 --- a/src/client/spark/view/Utility/WPFHelper.cs +++ b/src/client/spark/view/Utility/WPFHelper.cs @@ -259,13 +259,13 @@ namespace mbts.ui { } public static PropertyChangedCallback prop_changed_callback(PropertyChangedCallback callback) => - (d, e) => callback(ObjectHelper.try_convert(d), ObjectHelper.try_convert(e.OldValue), ObjectHelper.try_convert(e.NewValue)); + (d, e) => callback(ConvertUtils.try_convert(d), ConvertUtils.try_convert(e.OldValue), ConvertUtils.try_convert(e.NewValue)); public static PropertyChangedCallback prop_changed_callback(Action callback) => - (d, e) => callback(ObjectHelper.try_convert(d), ObjectHelper.try_convert(e.NewValue)); + (d, e) => callback(ConvertUtils.try_convert(d), ConvertUtils.try_convert(e.NewValue)); public static CoerceValueCallback coerce_value_callback(Func coerce_value) => - (d, obj) => coerce_value(ObjectHelper.try_convert(d), ObjectHelper.try_convert(obj)); + (d, obj) => coerce_value(ConvertUtils.try_convert(d), ConvertUtils.try_convert(obj)); public static double control_base_width(Thickness border_thickness, Thickness padding) => border_thickness.Left + padding.Left + padding.Right + border_thickness.Right; diff --git a/src/client/spark_core/utils/CompareUtils.cs b/src/client/spark_core/utils/CompareUtils.cs index cbfe01d6b..96937e8bf 100644 --- a/src/client/spark_core/utils/CompareUtils.cs +++ b/src/client/spark_core/utils/CompareUtils.cs @@ -47,7 +47,7 @@ namespace mbts.utils { public NonGenericComparerWrapper(IComparer comparer) => _comparer = comparer; public int Compare(object x, object y) => - _comparer.Compare(ObjectHelper.try_convert(x), ObjectHelper.try_convert(y)); + _comparer.Compare(ConvertUtils.try_convert(x), ConvertUtils.try_convert(y)); } #endregion } diff --git a/src/client/spark_core/utils/ConvertUtils.cs b/src/client/spark_core/utils/ConvertUtils.cs index dc12cd828..d8d9b259b 100644 --- a/src/client/spark_core/utils/ConvertUtils.cs +++ b/src/client/spark_core/utils/ConvertUtils.cs @@ -1,8 +1,5 @@ - -namespace System -{ - public static class ObjectHelper - { +namespace System { + public static class ConvertUtils { public static object try_convert(Type type, object obj) { try_convert(type, obj, out object result); return result;