diff --git a/Modules.Patterns/Modules/Clipboard.vb b/Modules.Patterns/Modules/Clipboard.vb index b175dc04..db25641e 100644 --- a/Modules.Patterns/Modules/Clipboard.vb +++ b/Modules.Patterns/Modules/Clipboard.vb @@ -11,7 +11,6 @@ Namespace [PatternModule] Public Const CLIPBOARD_VALUE_EN = "@Clipboard" Public Property PatternIdentifier As String = "CLIP" Implements IModule.PatternIdentifier - Public Property IsComplex As Boolean = False Implements IModule.IsComplex Public Sub New(pLogConfig As LogConfig) diff --git a/Modules.Patterns/Modules/Internal.vb b/Modules.Patterns/Modules/Internal.vb index f3807049..539e530f 100644 --- a/Modules.Patterns/Modules/Internal.vb +++ b/Modules.Patterns/Modules/Internal.vb @@ -14,7 +14,6 @@ Namespace [PatternModule] Public Const INT_VALUE_DATE = "DATE" Public Property PatternIdentifier As String = "INT" Implements IModule.PatternIdentifier - Public Property IsComplex As Boolean = False Implements IModule.IsComplex Public Sub New(pLogConfig As LogConfig) diff --git a/Modules.Patterns/Modules/User.vb b/Modules.Patterns/Modules/User.vb index 18ea6e15..6a823774 100644 --- a/Modules.Patterns/Modules/User.vb +++ b/Modules.Patterns/Modules/User.vb @@ -14,7 +14,6 @@ Namespace [PatternModule] Public Const USER_VALUE_USER_NAME = "USER_NAME" Public Property PatternIdentifier As String = "USER" Implements IModule.PatternIdentifier - Public Property IsComplex As Boolean = True Implements IModule.IsComplex Public Sub New(pLogConfig As LogConfig) diff --git a/Modules.Patterns/Patterns2.vb b/Modules.Patterns/Patterns2.vb index 1c7c1d87..5dcc70ef 100644 --- a/Modules.Patterns/Patterns2.vb +++ b/Modules.Patterns/Patterns2.vb @@ -94,13 +94,6 @@ Public Class Patterns2 Private Function GetReplaceMapForModule(pModule As IModule, pPanel As Panel, pUser As State.UserState) As Dictionary(Of String, Object) Dim oArgs As New Dictionary(Of String, Object) - Select Case pModule.GetType() - Case GetType(PatternModule.Clipboard) - - - End Select - - If TypeOf pModule Is PatternModule.Clipboard Then oArgs.Add(PatternModule.Clipboard.CLIP_VALUE_BOARD, My.Computer.Clipboard.GetText()) @@ -109,6 +102,7 @@ Public Class Patterns2 oArgs.Add(PatternModule.Internal.INT_VALUE_MACHINE, System.Environment.MachineName) oArgs.Add(PatternModule.Internal.INT_VALUE_DOMAIN, System.Environment.UserDomainName) oArgs.Add(PatternModule.Internal.INT_VALUE_DATE, Now.ToShortDateString) + ElseIf TypeOf pModule Is PatternModule.User Then oArgs.Add(PatternModule.User.USER_VALUE_EMAIL, pUser.Email) oArgs.Add(PatternModule.User.USER_VALUE_LANGUAGE, pUser.Language) @@ -117,8 +111,10 @@ Public Class Patterns2 oArgs.Add(PatternModule.User.USER_VALUE_SURNAME, pUser.Surname) oArgs.Add(PatternModule.User.USER_VALUE_USER_ID, pUser.UserId) oArgs.Add(PatternModule.User.USER_VALUE_USER_NAME, pUser.UserName) + ElseIf TypeOf pModule Is PatternModule.Controls Then oArgs.Add(PatternModule.Controls.CTRL_VALUE_PANEL, pPanel) + End If Return oArgs