From ab1008ef706e055014595cc0dd7692ffa01648b3 Mon Sep 17 00:00:00 2001 From: Jason Alborough Date: Fri, 29 Apr 2022 17:34:20 -0400 Subject: [PATCH] fix: remove inheritance and keep separate fb in class. --- .../Feedbacks/BoolWithFeedback.cs | 9 +++++---- .../Feedbacks/IntWithFeedback.cs | 9 +++++---- .../Feedbacks/StringWithFeedback.cs | 9 +++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolWithFeedback.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolWithFeedback.cs index 5d845a89..a6f0f383 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolWithFeedback.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/BoolWithFeedback.cs @@ -6,9 +6,10 @@ using Crestron.SimplSharp; namespace PepperDash.Essentials.Core.Feedbacks { - public class BoolWithFeedback : BoolFeedback + public class BoolWithFeedback { private bool _Value; + public BoolFeedback Feedback; public bool Value { get @@ -18,13 +19,13 @@ namespace PepperDash.Essentials.Core.Feedbacks set { _Value = value; - this.FireUpdate(); + Feedback.FireUpdate(); } } public BoolWithFeedback() - : base(() => Value) + { - + Feedback = new BoolFeedback(() => { return Value; }); } } diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntWithFeedback.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntWithFeedback.cs index 57a0e1b7..97ee3c8d 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntWithFeedback.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/IntWithFeedback.cs @@ -6,9 +6,10 @@ using Crestron.SimplSharp; namespace PepperDash.Essentials.Core.Feedbacks { - public class IntWithFeedback : IntFeedback + public class IntWithFeedback { private int _Value; + public IntFeedback Feedback; public int Value { get @@ -18,13 +19,13 @@ namespace PepperDash.Essentials.Core.Feedbacks set { _Value = value; - this.FireUpdate(); + Feedback.FireUpdate(); } } public IntWithFeedback() - : base(() => Value) + { - + Feedback = new IntFeedback((() => Value)); } } } \ No newline at end of file diff --git a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringWithFeedback.cs b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringWithFeedback.cs index bfdec1af..a8a5bca0 100644 --- a/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringWithFeedback.cs +++ b/essentials-framework/Essentials Core/PepperDashEssentialsBase/Feedbacks/StringWithFeedback.cs @@ -6,9 +6,10 @@ using Crestron.SimplSharp; namespace PepperDash.Essentials.Core.Feedbacks { - public class StringWithFeedback : StringFeedback + public class StringWithFeedback { private string _Value; + public StringFeedback Feedback; public string Value { get @@ -18,13 +19,13 @@ namespace PepperDash.Essentials.Core.Feedbacks set { _Value = value; - this.FireUpdate(); + Feedback.FireUpdate(); } } public StringWithFeedback() - : base(() => Value) + { - + Feedback = new StringFeedback(() => Value); } } } \ No newline at end of file