Zooflow: Fix messageboxes without title
This commit is contained in:
@@ -3,7 +3,7 @@ Imports System.Windows.Forms
|
||||
Imports DigitalData.Modules.Logging
|
||||
|
||||
Namespace Base
|
||||
Public Class BaseErrorHandler
|
||||
Public Class NNBaseErrorHandler
|
||||
Private ReadOnly _LogConfig As LogConfig
|
||||
Private ReadOnly _Logger As Logger
|
||||
Private ReadOnly _Form As Form
|
||||
|
||||
@@ -3,11 +3,10 @@ Imports DevExpress.XtraEditors
|
||||
Imports DigitalData.Modules.Logging
|
||||
|
||||
Namespace Base
|
||||
Public Class BaseForm
|
||||
Public Class NNBaseForm
|
||||
Inherits XtraForm
|
||||
|
||||
Private ReadOnly _Logger As Logger
|
||||
Private ReadOnly _ErrorHandler As BaseErrorHandler
|
||||
|
||||
Protected ReadOnly Property Logger As Logger
|
||||
Get
|
||||
@@ -25,7 +24,7 @@ Namespace Base
|
||||
|
||||
' My.LogConfig is undefined in the designer
|
||||
_Logger = LogConfig.GetLogger(oClassName)
|
||||
_ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me)
|
||||
'_ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me)
|
||||
|
||||
' When you add something, be careful if it
|
||||
' depends on a global var like My.LogConfig
|
||||
@@ -34,16 +33,16 @@ Namespace Base
|
||||
|
||||
''' ============== PUBLIC METHODS ==============
|
||||
Public Sub ShowInfoMessage(Message As String)
|
||||
_ErrorHandler.ShowInfoMessage(Message)
|
||||
'_ErrorHandler.ShowInfoMessage(Message)
|
||||
End Sub
|
||||
|
||||
Public Sub ShowErrorMessage(Exception As Exception)
|
||||
Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
|
||||
_ErrorHandler.ShowErrorMessage(Exception, oCallingClass)
|
||||
'_ErrorHandler.ShowErrorMessage(Exception, oCallingClass)
|
||||
End Sub
|
||||
|
||||
Public Sub ShowErrorMessage(ErrorMessage As String)
|
||||
_ErrorHandler.ShowErrorMessage(ErrorMessage)
|
||||
'_ErrorHandler.ShowErrorMessage(ErrorMessage)
|
||||
End Sub
|
||||
End Class
|
||||
End Namespace
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
Imports DevExpress.XtraBars.Docking
|
||||
Imports DevExpress.XtraBars.Ribbon
|
||||
Imports DigitalData.Modules.Logging
|
||||
|
||||
Namespace Base
|
||||
''' <summary>
|
||||
''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
|
||||
''' </summary>
|
||||
''' <example>
|
||||
''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form.
|
||||
'''
|
||||
''' Partial Class frmExample
|
||||
''' Inherits BaseRibbonForm
|
||||
'''
|
||||
''' ...
|
||||
''' End Class
|
||||
''' </example>
|
||||
Public Class BaseRibbonForm
|
||||
Inherits RibbonForm
|
||||
|
||||
Private _Logger As Logger
|
||||
Private _ErrorHandler As BaseErrorHandler
|
||||
|
||||
Protected ReadOnly Property Logger As Logger
|
||||
Get
|
||||
Return _Logger
|
||||
End Get
|
||||
End Property
|
||||
|
||||
Public Sub New()
|
||||
End Sub
|
||||
|
||||
Public Sub InitializeBaseForm(LogConfig As LogConfig)
|
||||
' Get the full name of the inheriting form
|
||||
' so the log messages have the right classname
|
||||
Dim oClassName = [GetType]().FullName
|
||||
|
||||
' My.LogConfig is undefined in the designer
|
||||
_Logger = LogConfig?.GetLogger(oClassName)
|
||||
_ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me)
|
||||
|
||||
' When you add something, be careful if it
|
||||
' depends on a global var like My.LogConfig
|
||||
' you might need to check for its existence with ?
|
||||
End Sub
|
||||
|
||||
''' ============== PUBLIC METHODS ==============
|
||||
Public Sub ShowInfoMessage(Message As String)
|
||||
_ErrorHandler.ShowInfoMessage(Message)
|
||||
End Sub
|
||||
|
||||
Public Sub ShowErrorMessage(Exception As Exception)
|
||||
Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
|
||||
_ErrorHandler.ShowErrorMessage(Exception, oCallingClass)
|
||||
End Sub
|
||||
|
||||
Public Sub ShowErrorMessage(ErrorMessage As String)
|
||||
Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
|
||||
_ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass)
|
||||
End Sub
|
||||
End Class
|
||||
End Namespace
|
||||
Reference in New Issue
Block a user