diff --git a/Config/ConfigManager.vb b/Config/ConfigManager.vb index 086275d8..3d3251a3 100644 --- a/Config/ConfigManager.vb +++ b/Config/ConfigManager.vb @@ -1,15 +1,14 @@ Imports System.IO Imports System.Reflection Imports System.Xml.Serialization -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Config.ConfigAttributes +Imports DigitalData.Modules.Config Public Class ConfigManager(Of T) Public Const USER_CONFIG_NAME As String = "UserConfig.xml" Public Const COMPUTER_CONFIG_NAME As String = "ComputerConfig.xml" Public Const APP_CONFIG_NAME As String = "AppConfig.xml" - Private ReadOnly _LogConfig As LogConfig + ' Private ReadOnly _LogConfig As LogConfig Private ReadOnly _Logger As Logger Private ReadOnly _File As FilesystemEx @@ -100,7 +99,7 @@ Public Class ConfigManager(Of T) ''' The path to check for a computer config file, eg. ProgramData (Usually Application.CommonAppDataPath) ''' The path to check for a third config file. This is useful when running the Application in an environment where AppData/ProgramData directories are not available ''' Override values from ComputerConfig with UserConfig - Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, Optional ApplicationStartupPath As String = "", Optional ForceUserConfig As Boolean = False) + ' Public Sub New(LogConfig As LogConfig, UserConfigPath As String, ComputerConfigPath As String, Optional ApplicationStartupPath As String = "", Optional ForceUserConfig As Boolean = False) _LogConfig = LogConfig _Logger = LogConfig.GetLogger() _File = New FilesystemEx(_LogConfig) @@ -136,7 +135,7 @@ Public Class ConfigManager(Of T) ''' ''' LogConfig instance ''' The path to check for a user config file, eg. AppData (Usually Application.UserAppDataPath or Application.LocalUserAppDataPath) - Public Sub New(LogConfig As LogConfig, ConfigPath As String) + ' Public Sub New(LogConfig As LogConfig, ConfigPath As String) MyClass.New(LogConfig, ConfigPath, String.Empty, String.Empty, ForceUserConfig:=True) End Sub