From ba970dac4ce9d308f6b0b9e826772f1866c25ad0 Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Tue, 30 Mar 2021 21:55:19 -0500 Subject: [PATCH] Cleaned up code. Changed variable names that hide fields. Removed unused imports. --- src/GameServiceWarden.Core/Games/GameServiceInfo.cs | 6 +++--- src/GameServiceWarden.Core/Games/GameServiceManager.cs | 4 ++-- src/GameServiceWarden.ModuleAPI/ServiceState.cs | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/GameServiceWarden.Core/Games/GameServiceInfo.cs b/src/GameServiceWarden.Core/Games/GameServiceInfo.cs index 7edd380..321b5a8 100644 --- a/src/GameServiceWarden.Core/Games/GameServiceInfo.cs +++ b/src/GameServiceWarden.Core/Games/GameServiceInfo.cs @@ -40,12 +40,12 @@ namespace GameServiceWarden.Core.Games this.assemblyName = assemblyName ?? throw new ArgumentNullException("assemblyName"); this.service.StateChangeEvent += OnServiceStateChange; - Dictionary configurables = new Dictionary(); + Dictionary tempConfigurables = new Dictionary(); foreach (IGameConfigurable configurable in service.Configurables) { - configurables.Add(configurable.OptionName, configurable); + tempConfigurables.Add(configurable.OptionName, configurable); } - this.configurables = new ReadOnlyDictionary(configurables); + this.configurables = new ReadOnlyDictionary(tempConfigurables); } /// diff --git a/src/GameServiceWarden.Core/Games/GameServiceManager.cs b/src/GameServiceWarden.Core/Games/GameServiceManager.cs index cc75b5a..fc4c33c 100644 --- a/src/GameServiceWarden.Core/Games/GameServiceManager.cs +++ b/src/GameServiceWarden.Core/Games/GameServiceManager.cs @@ -22,10 +22,10 @@ namespace GameServiceWarden.Core.Games public void CreateService(string serviceName, string assemblyName, string moduleName) { if (!this.modules.ContainsKey(assemblyName)) throw new KeyNotFoundException($"No file \"{assemblyName}\" found."); - IReadOnlyDictionary modules = this.modules[assemblyName]; + IReadOnlyDictionary assemblyModules = this.modules[assemblyName]; if (services.ContainsKey(serviceName)) throw new ArgumentException($"Service of Name \"{serviceName}\" already exists."); - services.Add(serviceName, new GameServiceInfo(modules[moduleName].InstantiateGameService(services.GetPathForKey(serviceName), true), moduleName, assemblyName)); + services.Add(serviceName, new GameServiceInfo(assemblyModules[moduleName].InstantiateGameService(services.GetPathForKey(serviceName), true), moduleName, assemblyName)); } public void DeleteService(string serviceName) diff --git a/src/GameServiceWarden.ModuleAPI/ServiceState.cs b/src/GameServiceWarden.ModuleAPI/ServiceState.cs index 6a1c453..0a42c77 100644 --- a/src/GameServiceWarden.ModuleAPI/ServiceState.cs +++ b/src/GameServiceWarden.ModuleAPI/ServiceState.cs @@ -1,5 +1,3 @@ -using System; - namespace GameServiceWarden.ModuleAPI { public enum ServiceState