Update Modules

MultiTool.Common/Documents/DocumentCleaner.vb

@@ -1,5 +1,6 @@
 Imports System.IO
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
 Imports MultiTool.Common.Templates
 
 Namespace Documents
@@ -7,12 +8,12 @@ Namespace Documents
         Inherits BaseClass
 
         Private ReadOnly Template As Template
-        Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File
+        Private ReadOnly FileEx As FilesystemEx
 
         Public Sub New(pLogConfig As LogConfig, pTemplate As Template)
             MyBase.New(pLogConfig)
             Template = pTemplate
-            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+            FileEx = New FilesystemEx(LogConfig)
         End Sub
 
         Public Function CleanImportedDocuments(pDocuments As List(Of Document)) As Boolean

MultiTool.Common/Report/ReportGenerator.vb

@@ -1,5 +1,6 @@
 Imports System.Text.RegularExpressions
 Imports DevExpress.XtraReports
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports MultiTool.Common.Documents
@@ -14,7 +15,7 @@ Public Class ReportGenerator(Of TReport As IReport)
     Private ReadOnly TemplateConfig As TemplateConfig
     Private ReadOnly GeneralConfig As GeneralConfig
     Private ReadOnly Patterns As Patterns
-    Private ReadOnly FileEx As DigitalData.Modules.Filesystem.File
+    Private ReadOnly FileEx As FilesystemEx
 
     Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer, pTemplateConfig As TemplateConfig, pGeneralConfig As GeneralConfig)
         MyBase.New(pLogConfig)
@@ -22,7 +23,7 @@ Public Class ReportGenerator(Of TReport As IReport)
         GeneralConfig = pGeneralConfig
         TemplateConfig = pTemplateConfig
         Patterns = New Patterns(pLogConfig, pGeneralConfig)
-        FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+        FileEx = New FilesystemEx(LogConfig)
     End Sub
 
     Public Function GetReportFilePath(pDocument As Document, pTemplate As Template)

MultiTool.Common/Winline/WebServiceData.vb

@@ -3,9 +3,8 @@ Imports System.Net.Http
 Imports System.Text
 Imports System.Xml
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language
 Imports MultiTool.Common.Documents
 Imports MultiTool.Common.Exceptions
 Imports MultiTool.Common.Templates
@@ -20,7 +19,7 @@ Namespace Winline
         Private ReadOnly Filters As FilterConfig
         Private ReadOnly Serializer As Serializer
         Private ReadOnly Winline As WinlineData
-        Private ReadOnly FileEx As File
+        Private ReadOnly FileEx As FilesystemEx
         Private ReadOnly Patterns As Patterns
 
         Public Event WebServiceProgress As EventHandler(Of String)
@@ -31,7 +30,7 @@ Namespace Winline
             Config = pWebserviceConfig
             Filters = pFilterConfig
             Patterns = New Patterns(pLogConfig, pGeneralConfig)
-            FileEx = New File(LogConfig)
+            FileEx = New FilesystemEx(LogConfig)
             Winline = pWinline
         End Sub
 

MultiTool.Common/Winline/WinlineData.vb

@@ -1,8 +1,7 @@
 Imports System.Text.RegularExpressions
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
-Imports DigitalData.Modules.Language
-Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Base
 Imports MultiTool.Common.Winline.Entities
 Imports MultiTool.Common.Constants
 Imports MultiTool.Common.Templates
@@ -17,7 +16,7 @@ Namespace Winline
         Private ReadOnly Property MandatorConfig As MandatorConfig
         Private ReadOnly Property MappingConfig As MappingConfig
         Private ReadOnly Property Patterns As Patterns
-        Private ReadOnly Property FileEx As File
+        Private ReadOnly Property FileEx As FilesystemEx
 
         Public Property Articles As New List(Of Article)
         Public Property Accounts As New List(Of Account)
@@ -33,7 +32,7 @@ Namespace Winline
             Config = pConfig
             MandatorConfig = pMandatorConfig
             MappingConfig = pMappingConfig
-            FileEx = New File(pLogConfig)
+            FileEx = New FilesystemEx(pLogConfig)
             Years = LoadEconomicYears()
         End Sub
 
@@ -572,7 +571,7 @@ Namespace Winline
                     FROM [{pMandator.Database}].[dbo].[v021]
                     WHERE [c011] = '{pArticleNumber}'
                     AND [mesocomp] = '{pMandator.Id}' AND [mesoyear] = {oYear}"
-                Dim oEAN As String = Utils.NotNull(Database.GetScalarValue(oSQL), Nothing)
+                Dim oEAN As String = ObjectEx.NotNull(Database.GetScalarValue(oSQL), Nothing)
 
                 ' EAN not found in this Mandator, continue to next one
                 If oEAN Is Nothing Then
@@ -942,7 +941,7 @@ Namespace Winline
                     Return pRunningNumber
                 Else
                     Logger.Debug("Running number [{0}] already exists. Checking again.", pRunningNumber)
-                    Dim oVersionResult = FileEx.GetVersionedString(pRunningNumber, "~"c)
+                    Dim oVersionResult = FileEx.GetVersionedString(pRunningNumber)
                     Dim oNewVersion = oVersionResult.Item2 + 1
                     Dim oFinalLength As Integer = oVersionResult.Item1.Count + oNewVersion.ToString.Count + 1
 

MultiTool.Form/frmExportMain.vb

@@ -1,10 +1,9 @@
 Imports DevExpress.XtraEditors
-Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Language
 Imports MultiTool.Common.Templates
 Imports MultiTool.Common.Exceptions
 Imports MultiTool.Common.Winline
@@ -21,7 +20,7 @@ Public Class frmExportMain
     Private WebService As WebServiceData
     Private Winline As WinlineData
     Private GridBuilder As GridBuilder
-    Private FileEx As DigitalData.Modules.Filesystem.File
+    Private FileEx As FilesystemEx
 
     Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Common.Config), pTemplate As Template)
         ' Dieser Aufruf ist für den Designer erforderlich.
@@ -50,7 +49,7 @@ Public Class frmExportMain
                 WithClipboardHandler()
 
             Winline = My.Winline
-            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+            FileEx = New FilesystemEx(LogConfig)
             WebService = New WebServiceData(LogConfig, Database, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration, My.FilterConfiguration)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
 
@@ -181,7 +180,7 @@ Public Class frmExportMain
             dateDocDateTo.DoValidate()
 
             Dim oMandator = lookupMandator.EditValue
-            Dim oYear = Utils.NotNull(comboYear.EditValue, 0)
+            Dim oYear = ObjectEx.NotNull(comboYear.EditValue, 0)
             Dim oAccount = lookupAccount.EditValue
             Dim oKindsAsObjects As List(Of Object) = comboDocumentKind.EditValue
             Dim oKinds As List(Of DocumentKind) = oKindsAsObjects.Cast(Of DocumentKind).ToList()
@@ -189,8 +188,8 @@ Public Class frmExportMain
             Dim oDateFrom = dateDocDateFrom.EditValue
             Dim oDateTo = dateDocDateTo.EditValue
             Dim oShowExported = chkShowExported.Checked
-            Dim oDocNumberFrom = Utils.NotNull(txtDocumentFrom.EditValue, String.Empty)
-            Dim oDocNumberTo = Utils.NotNull(txtDocumentTo.EditValue, String.Empty)
+            Dim oDocNumberFrom = ObjectEx.NotNull(txtDocumentFrom.EditValue, String.Empty)
+            Dim oDocNumberTo = ObjectEx.NotNull(txtDocumentTo.EditValue, String.Empty)
 
             Dim oDocType As WinlineData.DocumentType = MapDocumentTypeToEnum(Of WinlineData.DocumentType)(comboDocumentType.EditValue)
 

MultiTool.Form/frmImportMain.vb

@@ -4,6 +4,7 @@ Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraReports.UI
 Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
@@ -13,7 +14,6 @@ Imports MultiTool.Common.Templates
 Imports MultiTool.Common.Winline
 Imports MultiTool.Common.Winline.Entities
 Imports MultiTool.Common.Constants
-Imports MultiTool.Common.Exceptions
 
 Public Class frmImportMain
     Public LogConfig As LogConfig
@@ -22,7 +22,7 @@ Public Class frmImportMain
     Private Logger As Logger
     Private Database As MSSQLServer
     Private Winline As WinlineData
-    Private FileEx As DigitalData.Modules.Filesystem.File
+    Private FileEx As FilesystemEx
     Private WebService As WebServiceData
     Private DocumentLoader As Documents.DocumentLoader
     Private DocumentCleaner As Documents.DocumentCleaner
@@ -73,7 +73,7 @@ Public Class frmImportMain
             GridViewFiles.OptionsView.ShowAutoFilterRow = False
 
             Winline = My.Winline
-            FileEx = New DigitalData.Modules.Filesystem.File(LogConfig)
+            FileEx = New FilesystemEx(LogConfig)
             WebService = New WebServiceData(LogConfig, Database, Winline, My.GeneralConfiguration.Webservice, My.GeneralConfiguration, My.FilterConfiguration)
             AddHandler WebService.WebServiceProgress, AddressOf WebService_Progress
 
@@ -707,10 +707,10 @@ Public Class frmImportMain
 
             Dim oDocument As Document = GridViewFiles.GetRow(GridViewFiles.FocusedRowHandle)
             Dim oNewDocument = Await DocumentLoader.LoadFile(oDocument.File, CurrentTemplate, lookupMandator.EditValue)
-                Dim oIndex = DocumentLoader.Files.IndexOf(oDocument)
-                DocumentLoader.Files.Item(oIndex) = oNewDocument
+            Dim oIndex = DocumentLoader.Files.IndexOf(oDocument)
+            DocumentLoader.Files.Item(oIndex) = oNewDocument
 
-                LoadDocument(oNewDocument)
+            LoadDocument(oNewDocument)
 
         Catch ex As Exception
             FormHelper.ShowError(ex, My.Resources.frmImportMainExtra.Neuladen_des_Dokuments)