diff --git a/Pepperdash Core/CLZ Builds/PepperDash_Core.clz b/Pepperdash Core/CLZ Builds/PepperDash_Core.clz index 2f87564..59f1373 100644 Binary files a/Pepperdash Core/CLZ Builds/PepperDash_Core.clz and b/Pepperdash Core/CLZ Builds/PepperDash_Core.clz differ diff --git a/Pepperdash Core/CLZ Builds/PepperDash_Core.dll b/Pepperdash Core/CLZ Builds/PepperDash_Core.dll index b6ba81e..bcff195 100644 Binary files a/Pepperdash Core/CLZ Builds/PepperDash_Core.dll and b/Pepperdash Core/CLZ Builds/PepperDash_Core.dll differ diff --git a/Pepperdash Core/Pepperdash Core.suo b/Pepperdash Core/Pepperdash Core.suo index dee26f0..4b3fdd6 100644 Binary files a/Pepperdash Core/Pepperdash Core.suo and b/Pepperdash Core/Pepperdash Core.suo differ diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs index a040e39..bd7979c 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplChildObjectBase.cs @@ -62,6 +62,9 @@ namespace PepperDash.Core.JsonToSimpl Debug.Console(1, "JSON Child [{0}] cannot link to master {1}", key, masterUniqueId); } + public void SetPathPrefix(string pathPrefix) { + PathPrefix = pathPrefix; + } /// /// Set the JPath to evaluate for a given bool out index. /// @@ -121,23 +124,21 @@ namespace PepperDash.Core.JsonToSimpl if (Process(BoolPaths[index], out response)) OnBoolChange(response.Equals("true", StringComparison.OrdinalIgnoreCase), index, JsonToSimplConstants.BoolValueChange); - else - OnBoolChange(false, index, JsonToSimplConstants.BoolValueChange); + else { } + // OnBoolChange(false, index, JsonToSimplConstants.BoolValueChange); } // Processes the path to a ushort, converting to ushort if able, firing off UshrtChange event void ProcessUshortPath(ushort index) { string response; - if (Process(UshortPaths[index], out response)) - { + if (Process(UshortPaths[index], out response)) { ushort val; - try { val = Convert.ToUInt16(response); } - catch { val = 0; } + try { val = Convert.ToUInt16(response); } catch { val = 0; } OnUShortChange(val, index, JsonToSimplConstants.UshortValueChange); - } - else - OnUShortChange(0, index, JsonToSimplConstants.UshortValueChange); + } + else { } + // OnUShortChange(0, index, JsonToSimplConstants.UshortValueChange); } // Processes the path to a string property and fires of a StringChange event. @@ -146,8 +147,8 @@ namespace PepperDash.Core.JsonToSimpl string response; if (Process(StringPaths[index], out response)) OnStringChange(response, index, JsonToSimplConstants.StringValueChange); - else - OnStringChange("", index, JsonToSimplConstants.StringValueChange); + else { } + // OnStringChange("", index, JsonToSimplConstants.StringValueChange); } /// diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs index 531183f..4818711 100644 --- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs +++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplMaster.cs @@ -106,7 +106,9 @@ namespace PepperDash.Core.JsonToSimpl /// public void AddChild(JsonToSimplChildObjectBase child) { - if (Children.Contains(child)) return; + if (Children.Contains(child)) { + Children.Remove(child); + } Children.Add(child); } diff --git a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo index 783ee38..5a20b25 100644 Binary files a/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo and b/Pepperdash Core/Pepperdash Core/PepperDash_Core.projectinfo differ