EDMI: Include Doctypes in ClientConfig

Modules.EDMIAPI/Client.vb

@@ -20,7 +20,7 @@ Public Class Client
     ' Runtime Variables
     Private ReadOnly ServerAddress As String
     Private ReadOnly ServerPort As Integer
-    Private ClientConfig As ConfigClientConfiguration
+    Private _ClientConfig As GlobalStateClientConfiguration
 
     ' Channel
     Private ReadOnly ChannelFactory As ChannelFactory(Of IEDMIServiceChannel)
@@ -32,6 +32,17 @@ Public Class Client
     ' Public Variables
     Public CachedTables As New List(Of String)
 
+    Public ReadOnly Property ClientConfig As GlobalStateClientConfiguration
+        Get
+            If _ClientConfig Is Nothing Then
+                Throw New ApplicationException("ClientConfig is empty! Please connect to the service before accessing this property")
+            End If
+
+            Return _ClientConfig
+        End Get
+    End Property
+
+
 
     ''' <summary>
     ''' Parse a IPAddress:Port String into its parts
@@ -127,7 +138,7 @@ Public Class Client
 
             Dim oResponse = Channel.GetClientConfig()
             If oResponse.OK Then
-                ClientConfig = oResponse.ClientConfig
+                _ClientConfig = oResponse.ClientConfig
             Else
                 Logger.Warn("Client Configuration could not be loaded: [{0}]", oResponse.ErrorMessage)
             End If
@@ -141,6 +152,7 @@ Public Class Client
         End Try
     End Function
 
+
     ''' <summary>
     ''' Aborts the channel and creates a new connection
     ''' </summary>
@@ -156,14 +168,6 @@ Public Class Client
         End Try
     End Sub
 
-    Public Function TryGetClientConfig() As ConfigClientConfiguration
-        If ClientConfig Is Nothing Then
-            Throw New ApplicationException("ClientConfig is empty! Please connect to the service before calling this function")
-        End If
-
-        Return ClientConfig
-    End Function
-
     Private Async Function UpdateTimer_Elapsed(sender As Object, e As Timers.ElapsedEventArgs) As Task Handles UpdateTimer.Elapsed
         Try
             Dim oTables As String() = Await Channel.GetCachedTablesAsync()
@@ -234,7 +238,7 @@ Public Class Client
         End Try
     End Function
 
-    Public Async Function GetFileObjectAsync(pObjectId As Long, pLoadFileContents As Boolean) As Task(Of FileObject)
+    Public Async Function ZooFlow_GetFileObjectAsync(pObjectId As Long, pLoadFileContents As Boolean) As Task(Of FileObject)
         Try
             Dim oGetFileObject As New Modules.Zooflow.GetFileObject(LogConfig, Me)
             Dim oFileObject = Await oGetFileObject.RunAsync(pObjectId, pLoadFileContents)