From 829670e086e05d6ea8ded55644cd635ea5c6be41 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 7 Jun 2023 10:07:36 +0200
Subject: [PATCH] remove Modules.Language from frmValidator

---
 app/TaskFlow/frmValidator.vb | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb
index 198ea8d..3b66ca0 100644
--- a/app/TaskFlow/frmValidator.vb
+++ b/app/TaskFlow/frmValidator.vb
@@ -6,8 +6,6 @@ Imports System.Text.RegularExpressions
 Imports System.ComponentModel
 Imports System.Globalization
 Imports DigitalData.Controls.LookupGrid
-Imports DigitalData.Modules.Language.Utils
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
 Imports DigitalData.Modules.EDMI.API.Constants
@@ -911,7 +909,7 @@ Public Class frmValidator
                                 lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
                                 lookup.Properties.MultiSelect = oMultiselect
 
-                                If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
+                                If GenericEx.NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
                                     lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
                                 End If
 
@@ -1466,15 +1464,15 @@ Public Class frmValidator
         Dim oControlname2Set = oRow.Item("NAME")
         LOGGER.Debug($"Workin on SetControLValue for {oControlname2Set} ...")
 
-        Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), -1)
-        Dim oControlDataSql = NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
+        Dim oConnectionId = GenericEx.NotNull(oRow.Item("CONNECTION_ID"), -1)
+        Dim oControlDataSql = GenericEx.NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
 
         If oConnectionId = -1 Or oControlDataSql = String.Empty Then
             LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!")
             Exit Sub
         End If
 
-        Dim oSqlCommand = NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
+        Dim oSqlCommand = GenericEx.NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
         oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
 
         'Dim oControlDataResult As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId, $"SetControlValues - CTRLID {oControlID}")
@@ -1729,7 +1727,7 @@ Public Class frmValidator
                                 Case GetType(TextEdit).ToString
                                     Try
                                         Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
-                                        oValue = Utils.NotNull(Of Object)(oValue, Nothing)
+                                        oValue = GenericEx.NotNull(Of Object)(oValue, Nothing)
                                         Try
                                             'oControl.Text = oValue
                                             DirectCast(oControl, TextEdit).EditValue = oValue
@@ -1852,7 +1850,7 @@ Public Class frmValidator
                                 Case GetType(TextEdit).ToString
                                     Try
                                         Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
-                                        oValue = Utils.NotNull(Of Object)(oValue, Nothing)
+                                        oValue = GenericEx.NotNull(Of Object)(oValue, Nothing)
                                         Try
                                             'oControl.Text = oValue
                                             DirectCast(oControl, TextEdit).EditValue = oValue
@@ -3025,7 +3023,7 @@ Public Class frmValidator
 
                     Dim oSourceIndexName As String = oControlRow.Item("INDEX_NAME")
                     ' Wenn kein defaultValue existiert, leeren String setzen
-                    Dim oDefaultValue As String = NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty)
+                    Dim oDefaultValue As String = GenericEx.NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty)
                     oIndexName = oSourceIndexName
                     oControName = oControl.Name
                     Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
@@ -3086,9 +3084,9 @@ Public Class frmValidator
                                         'oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString)
 
                                         If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then
-                                            oTextBox.EditValue = NotNull(oFormattedValue, oDefaultValue)
+                                            oTextBox.EditValue = GenericEx.NotNull(oFormattedValue, oDefaultValue)
                                         Else
-                                            oTextBox.EditValue = NotNull(oValueFromSource, oDefaultValue)
+                                            oTextBox.EditValue = GenericEx.NotNull(oValueFromSource, oDefaultValue)
                                         End If
 
                                         Try
@@ -4445,8 +4443,8 @@ Public Class frmValidator
                     End If
 
                     oControlId = oControlRow.Item("GUID")
-                    Dim oRegexMatch As String = NotNull(oControlRow.Item("REGEX_MATCH"), String.Empty)
-                    Dim oRegexMessage As String = NotNull(oControlRow.Item("REGEX_MESSAGE_DE"), String.Empty)
+                    Dim oRegexMatch As String = GenericEx.NotNull(oControlRow.Item("REGEX_MATCH"), String.Empty)
+                    Dim oRegexMessage As String = GenericEx.NotNull(oControlRow.Item("REGEX_MESSAGE_DE"), String.Empty)
                     oControlName = oControlRow.Item("CTRL_NAME")
                     Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA")
 
@@ -5267,7 +5265,7 @@ Public Class frmValidator
                             Dim oValueList As New List(Of String)
 
                             For Each item As Object In oRow.ItemArray
-                                item = NotNull(item, String.Empty)
+                                item = GenericEx.NotNull(item, String.Empty)
                                 ' Convert to string using InvariantCulture, so converting back from string does not screw up values
                                 If TypeOf item IsNot String Then
                                     item = String.Format(CultureInfo.InvariantCulture, "{0}", item)