From e6b0438d5d88d95df9d37446c53e7d53d852a88c Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Thu, 4 Oct 2018 15:29:47 -0700 Subject: [PATCH] Rename DomainManager property to DomainMgr (issue #18) --- SourceGen/DisplayList.cs | 2 +- SourceGen/Sandbox/ScriptManager.cs | 44 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/SourceGen/DisplayList.cs b/SourceGen/DisplayList.cs index 03af122..4d2858e 100644 --- a/SourceGen/DisplayList.cs +++ b/SourceGen/DisplayList.cs @@ -154,7 +154,7 @@ namespace SourceGen { /// /// Numeric offset value. Used to map a line item to the Anattrib. Note this is - /// set for all lines, and is the the same for all lines in a multi-line sequence, + /// set for all lines, and is the same for all lines in a multi-line sequence, /// e.g. every line in a long comment has the file offset with which it is associated. /// public int FileOffset { get; private set; } diff --git a/SourceGen/Sandbox/ScriptManager.cs b/SourceGen/Sandbox/ScriptManager.cs index 932f14c..edc9e5d 100644 --- a/SourceGen/Sandbox/ScriptManager.cs +++ b/SourceGen/Sandbox/ScriptManager.cs @@ -40,7 +40,7 @@ namespace SourceGen.Sandbox { /// /// Reference to DomainManager, if we're using one. /// - public DomainManager DomainManager { get; private set; } + public DomainManager DomainMgr { get; private set; } /// /// Collection of loaded plugins, if we're not using a DomainManager. @@ -60,9 +60,9 @@ namespace SourceGen.Sandbox { mProject = proj; if (!proj.UseMainAppDomainForPlugins) { - DomainManager = new DomainManager(UseKeepAliveHack); - DomainManager.CreateDomain("Plugin Domain", PluginDllCache.GetPluginDirPath()); - DomainManager.PluginMgr.SetFileData(proj.FileData); + DomainMgr = new DomainManager(UseKeepAliveHack); + DomainMgr.CreateDomain("Plugin Domain", PluginDllCache.GetPluginDirPath()); + DomainMgr.PluginMgr.SetFileData(proj.FileData); } else { mActivePlugins = new Dictionary(); } @@ -73,9 +73,9 @@ namespace SourceGen.Sandbox { /// the object after calling this. /// public void Cleanup() { - if (DomainManager != null) { - DomainManager.Dispose(); - DomainManager = null; + if (DomainMgr != null) { + DomainMgr.Dispose(); + DomainMgr = null; } mActivePlugins = null; mProject = null; @@ -86,16 +86,16 @@ namespace SourceGen.Sandbox { /// the list of extension scripts configured into the project has changed. /// public void Clear() { - if (DomainManager == null) { + if (DomainMgr == null) { mActivePlugins.Clear(); } else { - DomainManager.PluginMgr.ClearPluginList(); + DomainMgr.PluginMgr.ClearPluginList(); } } /// /// Attempts to load the specified plugin. If the plugin is already loaded, this - /// does nothing. If not, the assembly is loaded an an instance is created. + /// does nothing. If not, the assembly is loaded and an instance is created. /// /// Script identifier. /// Report with errors and warnings. @@ -108,7 +108,7 @@ namespace SourceGen.Sandbox { return false; } - if (DomainManager == null) { + if (DomainMgr == null) { if (mActivePlugins.TryGetValue(scriptIdent, out IPlugin plugin)) { return true; } @@ -118,20 +118,20 @@ namespace SourceGen.Sandbox { report = new FileLoadReport(dllPath); // empty report return true; } else { - IPlugin plugin = DomainManager.PluginMgr.LoadPlugin(dllPath, scriptIdent); + IPlugin plugin = DomainMgr.PluginMgr.LoadPlugin(dllPath, scriptIdent); return plugin != null; } } public IPlugin GetInstance(string scriptIdent) { - if (DomainManager == null) { + if (DomainMgr == null) { if (mActivePlugins.TryGetValue(scriptIdent, out IPlugin plugin)) { return plugin; } Debug.Assert(false); return null; } else { - return DomainManager.PluginMgr.GetPlugin(scriptIdent); + return DomainMgr.PluginMgr.GetPlugin(scriptIdent); } } @@ -140,14 +140,14 @@ namespace SourceGen.Sandbox { /// /// Newly-created list of plugin references. public List GetAllInstances() { - if (DomainManager == null) { + if (DomainMgr == null) { List list = new List(mActivePlugins.Count); foreach (KeyValuePair kvp in mActivePlugins) { list.Add(kvp.Value); } return list; } else { - return DomainManager.PluginMgr.GetActivePlugins(); + return DomainMgr.PluginMgr.GetActivePlugins(); } } @@ -158,12 +158,12 @@ namespace SourceGen.Sandbox { public void PrepareScripts(IApplication appRef) { List platSyms = GeneratePlatSymList(); - if (DomainManager == null) { + if (DomainMgr == null) { foreach (KeyValuePair kvp in mActivePlugins) { kvp.Value.Prepare(appRef, mProject.FileData, platSyms); } } else { - DomainManager.PluginMgr.PreparePlugins(appRef, platSyms); + DomainMgr.PluginMgr.PreparePlugins(appRef, platSyms); } } @@ -197,7 +197,7 @@ namespace SourceGen.Sandbox { /// public string DebugGetLoadedScriptInfo() { StringBuilder sb = new StringBuilder(); - if (DomainManager == null) { + if (DomainMgr == null) { foreach (KeyValuePair kvp in mActivePlugins) { string loc = kvp.Value.GetType().Assembly.Location; sb.Append("[main] "); @@ -206,10 +206,10 @@ namespace SourceGen.Sandbox { DebugGetScriptInfo(kvp.Value, sb); } } else { - List plugins = DomainManager.PluginMgr.GetActivePlugins(); + List plugins = DomainMgr.PluginMgr.GetActivePlugins(); foreach (IPlugin plugin in plugins) { - string loc = DomainManager.PluginMgr.GetPluginAssemblyLocation(plugin); - sb.AppendFormat("[sub {0}] ", DomainManager.Id); + string loc = DomainMgr.PluginMgr.GetPluginAssemblyLocation(plugin); + sb.AppendFormat("[sub {0}] ", DomainMgr.Id); sb.Append(loc); sb.Append("\r\n "); DebugGetScriptInfo(plugin, sb);