AppStd/Modules
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ZooFlow: clean up classes, use base class

Browse Source
This commit is contained in:
Jonathan Jenne
2021-10-26 11:45:10 +02:00
parent 0bc57ca2bb
commit 1b11cde174
5 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
GUIs.ZooFlow/ClassInit.vb
View File

@@ -14,9 +14,9 @@ Imports DigitalData.GUIs.ZooFlow.ClassInitLoader
Imports DigitalData.Controls.SQLConfig
Public Class ClassInit
Inherits Base.BaseClass
Private ReadOnly _MainForm As frmFlowForm
Private ReadOnly _Logger As Logger
Private ReadOnly _LogConfig As LogConfig
Private ReadOnly _DataASorDB As ClassDataASorDB
Private ReadOnly _Database As DatabaseWithFallback
Private _Loader As ClassInitLoader
@@ -24,9 +24,8 @@ Public Class ClassInit
Public Event Completed As EventHandler
Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm)
MyBase.New(LogConfig)
_MainForm = ParentForm
_LogConfig = LogConfig
_Logger = LogConfig.GetLogger()
'TODO: Remove when Globix uses DatabaseWithFallback
clsDataASorDB = New ClassDataASorDB(LogConfig)
@@ -37,7 +36,7 @@ Public Class ClassInit
MsgBox("Keine Verbindungs-Informationen hinterlegt. Anwendung wird beendet.", MsgBoxStyle.Critical, _MainForm.Text)
Application.Exit()
Else
_Loader = New ClassInitLoader()
_Loader = New ClassInitLoader(LogConfig)
' === Init Schritte definieren
_Loader.AddStep("Initializing Base", AddressOf InitializeBase, True)
@@ -68,7 +67,7 @@ Public Class ClassInit
My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString)
If My.DatabaseECM.DBInitialized = False Then
_Logger.Warn("Could not initialize DD_ECM-Database!")
Logger.Warn("Could not initialize DD_ECM-Database!")
Throw New InitException("Could not initialize ECM-Database!")
Else
@@ -76,12 +75,12 @@ Public Class ClassInit
Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl)
If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then
_Logger.Warn("No IDB connection entries in TBDD_CONNECTION found!")
Logger.Warn("No IDB connection entries in TBDD_CONNECTION found!")
Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
End If
If oDatatable.Rows.Count > 1 Then
_Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
End If
@@ -96,7 +95,7 @@ Public Class ClassInit
End If
If My.DatabaseIDB.DBInitialized = False Then
_Logger.Warn("Could not initialize IDB-Database!")
Logger.Warn("Could not initialize IDB-Database!")
Throw New InitException("Could not initialize IDB-Database!")
End If
End Sub
@@ -105,7 +104,7 @@ Public Class ClassInit
MyApplication.Service.Address = My.SystemConfig.AppServerConfig
Dim oServerData = Client.ParseServiceAddress(My.SystemConfig.AppServerConfig)
My.Application.Service.Client = New Client(_LogConfig, oServerData.Item1, oServerData.Item2)
My.Application.Service.Client = New Client(LogConfig, oServerData.Item1, oServerData.Item2)
If Not IsNothing(My.Application.Service.Client) Then
If My.Application.Service.Client.Connect() Then
@@ -113,15 +112,15 @@ Public Class ClassInit
End If
End If
Catch ex As Exception
_Logger.Error(ex)
Logger.Error(ex)
Throw New InitException("Error in InitializeService", ex)
End Try
End Sub
Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication)
Try
My.Database = New DatabaseWithFallback(_LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
My.Database = New DatabaseWithFallback(LogConfig, My.Application.Service.Client, My.DatabaseECM, My.DatabaseIDB)
Catch ex As Exception
_Logger.Error(ex)
Logger.Error(ex)
Throw New InitException("Error InitializeDatabaseWithFallback!", ex)
End Try
End Sub
@@ -155,7 +154,7 @@ Public Class ClassInit
Next
Catch ex As Exception
_Logger.Error(ex)
Logger.Error(ex)
Throw New InitException("Error while initializing user!", ex)
End Try
End Sub
@@ -182,7 +181,7 @@ Public Class ClassInit
MyApplication.Settings.GdPictureKey = NotNull(oRow.Item("LICENSE"), String.Empty)
Catch ex As Exception
_Logger.Error(ex)
Logger.Error(ex)
Throw New InitException("Error Initialize3rdParty!", ex)
End Try
End Sub
@@ -202,7 +201,7 @@ Public Class ClassInit
End Select
Next
Catch ex As Exception
_Logger.Error(ex)
Logger.Error(ex)
Throw New InitException("Error in InitBasicData", ex)
End Try
End Sub
@@ -300,15 +299,15 @@ Public Class ClassInit
Case "RESULT"
Dim oLines = oValue.ToString.Split("|"c)
_Logger.Debug("Access Result for Module {0}", ModuleName)
Logger.Debug("Access Result for Module {0}", ModuleName)
For Each oLine In oLines
_Logger.Debug(oLine.Trim)
Logger.Debug(oLine.Trim)
Next
Case "WORKING_MODE"
Dim oLines = oValue.ToString.Split("|"c)
_Logger.Debug("WORKING_MODEs for Module {0}", ModuleName)
Logger.Debug("WORKING_MODEs for Module {0}", ModuleName)
For Each oLine In oLines
_Logger.Debug(oLine.Trim)
Logger.Debug(oLine.Trim)
If oLine = "NO_BASICCONF" Then
MyApplication.User.HideBasicConfig = True
@@ -328,7 +327,7 @@ Public Class ClassInit
MyApplication.Search.SelectInIntegerAttributeIds = ""
End Try
Else
_Logger.Info($"Wrong WorkingMode: {oLine}")
Logger.Info($"Wrong WorkingMode: {oLine}")
End If
Next