From c8e466e388f729d35152b8ebc2d450be9cc9f63c Mon Sep 17 00:00:00 2001
From: Trevor Payne <tpayne@pepperdash.com>
Date: Fri, 20 Sep 2019 09:50:47 -0500
Subject: [PATCH]  Changed eventhandler type for ActualJsonFile to be in line
 with other event handlers

---
 .../Pepperdash Core/JsonToSimpl/EventArgs and Constants.cs   | 2 +-
 .../Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs     | 2 +-
 .../JsonToSimpl/JsonToSimplPortalFileMaster.cs               | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/EventArgs and Constants.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/EventArgs and Constants.cs
index 5fc3eed..bbbf7e2 100644
--- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/EventArgs and Constants.cs	
+++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/EventArgs and Constants.cs	
@@ -18,7 +18,7 @@ namespace PepperDash.Core.JsonToSimpl
 		public const ushort UshortValueChange = 101;
 		public const ushort StringValueChange = 201;
 		public const ushort FullPathToArrayChange = 202;
-        public const ushort JsonActualFileChange = 203;
+        public const ushort ActualFilePathChange = 203;
 	}
 
 	//**************************************************************************************************//
diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs
index 9865bf4..bd97267 100644
--- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs	
+++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplFileMaster.cs	
@@ -68,7 +68,7 @@ namespace PepperDash.Core.JsonToSimpl
 			}
 			//var actualFileName = actualFile.FullName;
 			ActualFilePath = actualFile.FullName;
-            OnStringChange(ActualFilePath, 0, JsonToSimplConstants.JsonActualFileChange);
+            OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 			Debug.Console(1, "Actual JSON file is {0}", ActualFilePath);
 
 			string json = File.ReadToEnd(ActualFilePath, System.Text.Encoding.ASCII);
diff --git a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs
index 40a31fd..282c717 100644
--- a/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs	
+++ b/Pepperdash Core/Pepperdash Core/JsonToSimpl/JsonToSimplPortalFileMaster.cs	
@@ -62,7 +62,7 @@ namespace PepperDash.Core.JsonToSimpl
 			if (actualLocalFile != null)
 			{
 				ActualFilePath = actualLocalFile.FullName;
-                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.JsonActualFileChange);
+                OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 			}
 			// If the local file does not exist, then read the portal file xyz.json
 			// and create the local.
@@ -75,7 +75,8 @@ namespace PepperDash.Core.JsonToSimpl
 					var newLocalPath = Path.ChangeExtension(actualPortalFile.FullName, "local.json");
 					// got the portal file, hand off to the merge / save method				
 					PortalConfigReader.ReadAndMergeFileIfNecessary(actualPortalFile.FullName, newLocalPath);
-					ActualFilePath = newLocalPath;
+					ActualFilePath = newLocalPath;
+                    OnStringChange(ActualFilePath, 0, JsonToSimplConstants.ActualFilePathChange);
 				}
 				else
 				{