From 817347af6fe48806bbd017c6c4c197ba8d0f14fb Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 26 Apr 2021 16:43:42 +0200 Subject: [PATCH] clean up --- Controls.SQLEditor/frmSQLEditor.vb | 2 +- GUIs.Common/Base/BaseErrorHandler.vb | 10 ++++++++++ GUIs.Common/Base/BaseForm.vb | 3 +-- GUIs.ZooFlow/frmFlowForm.vb | 6 +++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index d0bb01c9..c48c20c7 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -104,7 +104,7 @@ Public Class frmSQLEditor Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick If cmbConnections.SelectedItem Is Nothing Then - MsgBox("Bitte wählen sie einen ") + ShowErrorMessage("Bitte wählen sie eine Datenbank Verbindung!") Exit Sub End If diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 87a06c70..2c9617a4 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -24,6 +24,16 @@ Namespace Base MessageBox.Show(Message, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error) End Sub + Public Sub ShowErrorMessage(Text As String) + _Logger.Info(Text) + MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Error) + End Sub + + Public Sub ShowWarningMessage(Text As String) + _Logger.Info(Text) + MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Warning) + End Sub + Public Sub ShowInfoMessage(Text As String) _Logger.Info(Text) MessageBox.Show(Text, _Form.Text, MessageBoxButtons.OK, MessageBoxIcon.Information) diff --git a/GUIs.Common/Base/BaseForm.vb b/GUIs.Common/Base/BaseForm.vb index ed66dec4..f11cfabb 100644 --- a/GUIs.Common/Base/BaseForm.vb +++ b/GUIs.Common/Base/BaseForm.vb @@ -43,8 +43,7 @@ Namespace Base End Sub Public Sub ShowErrorMessage(ErrorMessage As String) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) - _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass) + _ErrorHandler.ShowErrorMessage(ErrorMessage) End Sub End Class End Namespace diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 22a70e64..dce6003e 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -287,9 +287,9 @@ Public Class frmFlowForm Dim oDT As DataTable = AppServerOrDB.GetDatatable("DD_ECM", oSql, "TBGI_FOLDERWATCH_USER", $"FOLDER_TYPE = 'DEFAULT' AND USER_ID = {My.Application.User.UserId}") If oDT.Rows.Count = 0 Then - Throw New ApplicationException("No Default Path configured for User!") - 'Logger.Warn("No Default Path configured for User. Skipping.") - 'Exit Sub + 'Throw New ApplicationException("No Default Path configured for User!") + Logger.Warn("No Default Path configured for User. Skipping.") + Exit Sub End If Dim oFolderWatchPath = oDT.Rows.Item(0).Item("FOLDER_PATH")