clean up

Author: chuongmep

CADPythonShell/CADPythonShellApplication.cs

@@ -29,7 +29,7 @@ public static void OnLoaded()
                 //var dllfullpath = Path.Combine(dllfolder, assemblyName + ".dll");
                 //CreateCommandLoaderAssembly(settings, dllfolder, assemblyName);
                 //seems like I need to pre-load my dependencies
-                AppDomain.CurrentDomain.Load(typeof(NpsConfig).Assembly.GetName());
+                AppDomain.CurrentDomain.Load(typeof(CpsConfig).Assembly.GetName());
 
                 ExecuteStartupScript();
                 return;
@@ -70,9 +70,9 @@ public static ImageSource GetEmbeddedPng(System.Reflection.Assembly app, string
             return source.Frames[0];
         }
 
-        public static IRpsConfig GetConfig()
+        public static ICpsConfig GetConfig()
         {
-            return new NpsConfig(GetSettingsFile());
+            return new CpsConfig(GetSettingsFile());
         }
 
         /// <summary>

CADRuntime/NpsConfig.cs CADRuntime/CpsConfig.csCADRuntime/NpsConfig.cs renamed to CADRuntime/CpsConfig.cs

@@ -5,9 +5,9 @@ namespace CADRuntime
 {
     /// <summary>
     /// Provides access functions to those parts of the CADPythonShell.xml file
-    /// that are also used in RpsAddin deployments.
+    /// that are also used in CPS Plugin deployments.
     /// </summary>
-    public class NpsConfig : IRpsConfig
+    public class CpsConfig : ICpsConfig
     {
         /// <summary>
         /// The full path to the settings file used
@@ -17,7 +17,7 @@ public class NpsConfig : IRpsConfig
         private readonly XDocument _settings;
         private readonly SettingsDictionary _dict;
 
-        public NpsConfig(string settingsFilePath)
+        public CpsConfig(string settingsFilePath)
         {
             _settingsPath = settingsFilePath;
             _settings = XDocument.Load(_settingsPath);

CADRuntime/INpsConfig.cs

@@ -2,7 +2,7 @@
 
 namespace CADRuntime
 {
-    public interface IRpsConfig
+    public interface ICpsConfig
     {
         /// <summary>
         /// Returns a list of string variables that the Runtime will add to

CADRuntime/ScriptExecutor.cs

@@ -14,9 +14,9 @@ namespace CADRuntime
     public class ScriptExecutor
     {
         private string _message;
-        private readonly IRpsConfig _config;
+        private readonly ICpsConfig _config;
 
-        public ScriptExecutor(IRpsConfig config)
+        public ScriptExecutor(ICpsConfig config)
         {
             _config = config;
 

CADRuntime/SettingsDictionary.cs

@@ -12,35 +12,35 @@ public class SettingsDictionary : IDictionary<string, string>
         private readonly IDictionary<string, string> _dict;
         private readonly string _settingsPath;
         private XDocument _settings;
-
+        private string nameVariable = "StringVariable";
         public SettingsDictionary(string settingsPath)
         {
             _settingsPath = settingsPath;
             _settings = XDocument.Load(_settingsPath);
 
-            _dict = _settings.Root.Descendants("StringVariable").ToDictionary(
+            _dict = _settings.Root.Descendants(nameVariable).ToDictionary(
                 v => v.Attribute("name").Value,
                 v => v.Attribute("value").Value);
         }
 
         private void SetVariable(string name, string value)
         {
-            var variable = _settings.Root.Descendants("StringVariable").Where(x => x.Attribute("name").Value == name).FirstOrDefault();
+            var variable = _settings.Root.Descendants(nameVariable).Where(x => x.Attribute("name").Value == name).FirstOrDefault();
             if (variable != null)
             {
                 variable.Attribute("value").Value = value.ToString();
             }
             else
             {
                 _settings.Root.Descendants("Variables").First().Add(
-                    new XElement("StringVariable", new XAttribute("name", name), new XAttribute("value", value)));
+                    new XElement(nameVariable, new XAttribute("name", name), new XAttribute("value", value)));
             }
             _settings.Save(_settingsPath);
         }
 
         private void RemoveVariable(string name)
         {
-            var variable = _settings.Root.Descendants("StringVariable").Where(x => x.Attribute("name").Value == name).FirstOrDefault();
+            var variable = _settings.Root.Descendants(nameVariable).Where(x => x.Attribute("name").Value == name).FirstOrDefault();
             if (variable != null)
             {
                 variable.Remove();
@@ -50,7 +50,7 @@ private void RemoveVariable(string name)
 
         private void ClearVariables()
         {
-            var variables = _settings.Root.Descendants("StringVariable");
+            var variables = _settings.Root.Descendants(nameVariable);
             foreach (var variable in variables)
             {
                 variable.Remove();