AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update deps, deprecate Language

Browse Source
This commit is contained in:
Jonathan Jenne 2023-10-13 09:44:59 +02:00
parent 5df933c5f5
commit 76ab452b3f
12 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GUIs.ClipboardWatcher/ClipboardWatcher.vbproj
View File

@ -73,10 +73,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath> <HintPath>..\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>

32
GUIs.ClipboardWatcher/ProfileFilter.vb
View File

@ -405,8 +405,8 @@ Public Class ProfileFilter
Dim oCountConnectionId = String.Empty Dim oCountConnectionId = String.Empty
Try Try
oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty) oCountCommand = oRow.ItemEx("COUNT_COMMAND", String.Empty)
oCountConnectionId = NotNull(oRow.Item("CONN_ID"), 0) oCountConnectionId = oRow.ItemEx("CONN_ID", 0)
If oCountCommand = String.Empty Then If oCountCommand = String.Empty Then
Logger.Debug("Data SQL Query is empty. Skipping.") Logger.Debug("Data SQL Query is empty. Skipping.")
@ -421,7 +421,7 @@ Public Class ProfileFilter
Logger.Debug("Count-Command DATA before execute: [{0}]", oCountCommand) Logger.Debug("Count-Command DATA before execute: [{0}]", oCountCommand)
Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId) Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId)
oResultData += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0) oResultData += ObjectEx.NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
Logger.Debug("Datarows returned from search: [{0}]", oResultData) Logger.Debug("Datarows returned from search: [{0}]", oResultData)
Catch ex As Exception Catch ex As Exception
@ -436,8 +436,8 @@ Public Class ProfileFilter
Dim oCountConnectionId = String.Empty Dim oCountConnectionId = String.Empty
Try Try
oCountCommand = NotNull(oRow.Item("COUNT_COMMAND"), String.Empty) oCountCommand = oRow.ItemEx("COUNT_COMMAND", String.Empty)
oCountConnectionId = NotNull(oRow.Item("CONN_ID"), 0) oCountConnectionId = oRow.ItemEx("CONN_ID", 0)
If oCountCommand = String.Empty Then If oCountCommand = String.Empty Then
Logger.Debug("Document SQL Query is empty. Skipping.") Logger.Debug("Document SQL Query is empty. Skipping.")
@ -452,7 +452,7 @@ Public Class ProfileFilter
Logger.Debug("Count-Command for Documents BEFORE execute: [{0}]", oCountCommand) Logger.Debug("Count-Command for Documents BEFORE execute: [{0}]", oCountCommand)
Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId) Dim oConnectionString = ProfileUtils.GetConnectionString(Database, oCountConnectionId)
oResultDocs += NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0) oResultDocs += ObjectEx.NotNull(Of Integer)(Database.GetScalarValueWithConnection(oCountCommand, oConnectionString), 0)
Logger.Debug("Documents returned from search: [{0}]", oResultDocs) Logger.Debug("Documents returned from search: [{0}]", oResultDocs)
Catch ex As Exception Catch ex As Exception
@ -577,9 +577,9 @@ Public Class ProfileFilter
oList.Add(New ProfileData() With { oList.Add(New ProfileData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.Regex = oRow.Item("REGEX_EXPRESSION"), .Regex = oRow.Item("REGEX_EXPRESSION"),
.Name = NotNull(oRow.Item("NAME"), String.Empty), .Name = oRow.ItemEx("NAME", String.Empty),
.Comment = NotNull(oRow.Item("COMMENT"), String.Empty), .Comment = oRow.ItemEx("COMMENT", String.Empty),
.ProfileType = NotNull(oRow.Item("PROFILE_TYPE"), String.Empty), .ProfileType = oRow.ItemEx("PROFILE_TYPE", String.Empty),
.Processes = oProcessList, .Processes = oProcessList,
.Windows = oWindowList, .Windows = oWindowList,
.Controls = oControlList .Controls = oControlList
@ -605,9 +605,9 @@ Public Class ProfileFilter
If oRow.Item("PROFILE_ID") = ProfileId Then If oRow.Item("PROFILE_ID") = ProfileId Then
oControlList.Add(New ControlData() With { oControlList.Add(New ControlData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.ProcessName = NotNull(oRow.Item("PROCESS_NAME"), String.Empty), .ProcessName = oRow.ItemEx("PROCESS_NAME", String.Empty),
.ControlName = NotNull(oRow.Item("CONTROL_NAME"), String.Empty), .ControlName = oRow.ItemEx("CONTROL_NAME", String.Empty),
.Description = NotNull(oRow.Item("DESCRIPTION"), String.Empty), .Description = oRow.ItemEx("DESCRIPTION", String.Empty),
.WindowId = oRow.Item("WINDOW_ID"), .WindowId = oRow.Item("WINDOW_ID"),
.TopLeft = New ControlBounds() With { .TopLeft = New ControlBounds() With {
.Left = oRow.Item("TOPLEFT_LEFT"), .Left = oRow.Item("TOPLEFT_LEFT"),
@ -652,7 +652,7 @@ Public Class ProfileFilter
oProcessList.Add(New ProcessData() With { oProcessList.Add(New ProcessData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.PROFILE_ID = oRow.Item("PROFILE_ID"), .PROFILE_ID = oRow.Item("PROFILE_ID"),
.ProcessName = NotNull(oRow.Item("PROC_NAME"), String.Empty) .ProcessName = oRow.ItemEx("PROC_NAME", String.Empty)
}) })
End If End If
Next Next
@ -676,9 +676,9 @@ Public Class ProfileFilter
oWindowList.Add(New WindowData() With { oWindowList.Add(New WindowData() With {
.Guid = oRow.Item("GUID"), .Guid = oRow.Item("GUID"),
.WindowProcessID = oRow.Item("PROCESS_ID"), .WindowProcessID = oRow.Item("PROCESS_ID"),
.Title = NotNull(oRow.Item("DESCRIPTION"), String.Empty), .Title = oRow.ItemEx("DESCRIPTION", String.Empty),
.Regex = NotNull(oRow.Item("REGEX"), String.Empty), .Regex = oRow.ItemEx("REGEX", String.Empty),
.Sequence = NotNull(oRow.Item("SEQUENCE"), 0) .Sequence = oRow.ItemEx("SEQUENCE", 0)
}) })
End If End If
Next Next

2
GUIs.ClipboardWatcher/ProfileSearches.vb
View File

@ -64,7 +64,7 @@ Public Class ProfileSearches
' For now we assume these are document results instead of data results ' For now we assume these are document results instead of data results
Dim oSearches = Await LoadDocumentSearchesAsync(pProfile.Guid) Dim oSearches = Await LoadDocumentSearchesAsync(pProfile.Guid)
Dim oNameSlug = ConvertTextToSlug(pProfile.Name) Dim oNameSlug = StringEx.ConvertTextToSlug(pProfile.Name)
Dim oSearchGuids = oSearches.Select(Function(s) s.Guid).ToArray Dim oSearchGuids = oSearches.Select(Function(s) s.Guid).ToArray
Dim oWindowGuid = $"{pProfile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}" Dim oWindowGuid = $"{pProfile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}"
Dim oParams = New DocumentResultList.Params() With { Dim oParams = New DocumentResultList.Params() With {

7
GUIs.ClipboardWatcher/frmMatch.vb
View File

@ -9,6 +9,7 @@ Imports DigitalData.Modules.Language
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.Modules.ZooFlow.Params
Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.Modules.ZooFlow.Constants
Imports DigitalData.Modules.Base
''' <summary> ''' <summary>
''' '''
@ -67,12 +68,12 @@ Public Class frmMatch
_Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents) _Logger.Debug("ClipboardContents: [{0}]", Params.ClipboardContents)
_Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString) _Logger.Debug("OperationModeOverride: [{0}]", Params.OperationModeOverride.ToString)
_Language = Utils.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US) _Language = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language) Thread.CurrentThread.CurrentUICulture = New CultureInfo(_Language)
End Sub End Sub
Private Function GetResultString(CreatedTiles, MatchedProfiles, ClipboardContents) As String Private Function GetResultString(CreatedTiles, MatchedProfiles, ClipboardContents) As String
Dim oLanguage = Utils.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US) Dim oLanguage = ObjectEx.NotNull(_Environment.User.Language, State.UserState.LANG_EN_US)
Select Case _Language Select Case _Language
Case State.UserState.LANG_DE_DE Case State.UserState.LANG_DE_DE
@ -357,7 +358,7 @@ Public Class frmMatch
End Function End Function
Private Sub OpenDataResults(Profile As ProfileData, Searches As List(Of ProfileSearches.Search)) Private Sub OpenDataResults(Profile As ProfileData, Searches As List(Of ProfileSearches.Search))
Dim oNameSlug = Utils.ConvertTextToSlug(Profile.Name) Dim oNameSlug = StringEx.ConvertTextToSlug(Profile.Name)
Dim oSearchGuids = Searches.Select(Function(s) s.Guid).ToArray Dim oSearchGuids = Searches.Select(Function(s) s.Guid).ToArray
Dim oWindowGuid = $"{Profile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}" Dim oWindowGuid = $"{Profile.Guid}-{oNameSlug}-{String.Join("-", oSearchGuids)}"
Dim oParams = New DataResultParams() With { Dim oParams = New DataResultParams() With {

3
GUIs.Common/Common.vbproj
View File

@ -80,9 +80,6 @@
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Language">
<HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>

2
GUIs.Common/ControlHelper.vb
View File

@ -11,7 +11,7 @@ Public Class ControlHelper
End Sub End Sub
Public Function HasValue(pControl As Control) As Boolean Public Function HasValue(pControl As Control) As Boolean
Return Utils.NotNull(GetValue(pControl), Nothing) IsNot Nothing Return ObjectEx.NotNull(GetValue(pControl), Nothing) IsNot Nothing
End Function End Function
Public Function GetValue(pControl As Control) As Object Public Function GetValue(pControl As Control) As Object

9
GUIs.Common/DataResultList/frmDataResultList.vb
View File

@ -13,6 +13,7 @@ Imports DigitalData.GUIs.Common
Imports System.ComponentModel Imports System.ComponentModel
Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.Modules.ZooFlow.Constants
Imports DigitalData.Modules.Base
Public Class frmDataResultList Public Class frmDataResultList
Implements IResultForm Implements IResultForm
@ -61,11 +62,11 @@ Public Class frmDataResultList
SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
If Utils.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then If ScreenEx.IsVisibleOnAnyScreen(_Config.Config.WindowLocation) Then
If Utils.LocationIsVisible(_Config.Config.WindowLocation) Then If ScreenEx.LocationIsVisible(_Config.Config.WindowLocation) Then
Location = _Config.Config.WindowLocation Location = _Config.Config.WindowLocation
End If End If
If Utils.SizeIsVisible(_Config.Config.WindowSize) Then If ScreenEx.SizeIsVisible(_Config.Config.WindowSize) Then
Size = _Config.Config.WindowSize Size = _Config.Config.WindowSize
End If End If
End If End If
@ -236,7 +237,7 @@ Public Class frmDataResultList
If oActiveGrid IsNot Nothing Then If oActiveGrid IsNot Nothing Then
Dim oGridBand = _ActiveGridBand Dim oGridBand = _ActiveGridBand
XtraSaveFileDialog.FileName = Utils.ConvertTextToSlug(oGridBand.Caption) & ".xlsx" XtraSaveFileDialog.FileName = StringEx.ConvertTextToSlug(oGridBand.Caption) & ".xlsx"
XtraSaveFileDialog.DefaultExt = ".xlsx" XtraSaveFileDialog.DefaultExt = ".xlsx"
If XtraSaveFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then If XtraSaveFileDialog.ShowDialog() = Windows.Forms.DialogResult.OK Then

7
GUIs.Common/DocumentResultList/Layout.vb
View File

@ -6,7 +6,6 @@ Imports DevExpress.XtraGrid.Views.Grid
Imports DigitalData.Modules.Base Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Config Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Namespace DocumentResultList Namespace DocumentResultList
@ -124,11 +123,11 @@ Namespace DocumentResultList
End Function End Function
Public Sub LoadWindowLocationAndSize(ByRef pForm As Form) Public Sub LoadWindowLocationAndSize(ByRef pForm As Form)
If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then If ScreenEx.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then
If Utils.LocationIsVisible(Config.Config.WindowLocation) Then If ScreenEx.LocationIsVisible(Config.Config.WindowLocation) Then
pForm.Location = Config.Config.WindowLocation pForm.Location = Config.Config.WindowLocation
End If End If
If Utils.SizeIsVisible(Config.Config.WindowSize) Then If ScreenEx.SizeIsVisible(Config.Config.WindowSize) Then
pForm.Size = Config.Config.WindowSize pForm.Size = Config.Config.WindowSize
End If End If
End If End If

2
GUIs.Common/DocumentResultList/Watcher.vb
View File

@ -112,7 +112,7 @@ Namespace DocumentResultList
Try Try
Dim oTempPath = Path.Combine(Path.GetTempPath(), Constants.TEMP_PATH_SUBFOLDER) Dim oTempPath = Path.Combine(Path.GetTempPath(), Constants.TEMP_PATH_SUBFOLDER)
Dim oDirectory = Directory.CreateDirectory(oTempPath) Dim oDirectory = Directory.CreateDirectory(oTempPath)
Dim oFileName = $"{pDocument.Id}-{Now.UnixTimestamp}.{pDocument.Extension}" Dim oFileName = $"{pDocument.Id}-{Now.GetUnixTimestamp}.{pDocument.Extension}"
Dim oFilePath = Path.Combine(oTempPath, oFileName) Dim oFilePath = Path.Combine(oTempPath, oFileName)
Using oMemoryStream As New MemoryStream(pDocument.Contents) Using oMemoryStream As New MemoryStream(pDocument.Contents)

2
GUIs.Common/DocumentResultList/Workspace.vb
View File

@ -63,7 +63,7 @@ Namespace DocumentResultList
Private Function GetWorkspacePath(pWorkspaceName As String) As String Private Function GetWorkspacePath(pWorkspaceName As String) As String
Dim oDirectory = GetWorkspaceDirectoryPath() Dim oDirectory = GetWorkspaceDirectoryPath()
Dim oFilename As String = Utils.ConvertTextToSlug(pWorkspaceName) & "_" & _UserLanguage & ".xml" Dim oFilename As String = StringEx.ConvertTextToSlug(pWorkspaceName) & "_" & _UserLanguage & ".xml"
Return IO.Path.Combine(oDirectory, oFilename) Return IO.Path.Combine(oDirectory, oFilename)
End Function End Function

6
GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
View File

@ -5,7 +5,7 @@ Imports DevExpress.XtraEditors
Imports DevExpress.XtraLayout Imports DevExpress.XtraLayout
Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.EDMI.API
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Base
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Public Class ctrlObjectPropertyDialog Public Class ctrlObjectPropertyDialog
@ -167,8 +167,8 @@ Public Class ctrlObjectPropertyDialog
txtObjectId.Text = oRow.Item("IDB_OBJ_ID") txtObjectId.Text = oRow.Item("IDB_OBJ_ID")
txtCreatedWhen.Text = oRow.Item("ADDED_WHEN") txtCreatedWhen.Text = oRow.Item("ADDED_WHEN")
txtCreatedWho.Text = oRow.Item("ADDED_WHO") txtCreatedWho.Text = oRow.Item("ADDED_WHO")
txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN_SUBSTRUCTURE"), String.Empty) txtChangedWhen.Text = oRow.ItemEx("CHANGED_WHEN_SUBSTRUCTURE", String.Empty)
txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO_SUBSTRUCTURE"), String.Empty) txtChangedWho.Text = oRow.ItemEx("CHANGED_WHO_SUBSTRUCTURE", String.Empty)
lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString
lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString

6
GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
View File

@ -5,7 +5,7 @@ Imports DevExpress.XtraSplashScreen
Imports DigitalData.Modules.Database Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Base
Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.EDMI.API
Public Class frmObjectPropertyDialog Public Class frmObjectPropertyDialog
@ -195,8 +195,8 @@ Public Class frmObjectPropertyDialog
txtObjectId.Text = oRow.Item("IDB_OBJ_ID") txtObjectId.Text = oRow.Item("IDB_OBJ_ID")
txtCreatedWhen.Text = oRow.Item("ADDED_WHEN") txtCreatedWhen.Text = oRow.Item("ADDED_WHEN")
txtCreatedWho.Text = oRow.Item("ADDED_WHO") txtCreatedWho.Text = oRow.Item("ADDED_WHO")
txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN"), String.Empty) txtChangedWhen.Text = oRow.ItemEx("CHANGED_WHEN", String.Empty)
txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO"), String.Empty) txtChangedWho.Text = oRow.ItemEx("CHANGED_WHO", String.Empty)
lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString
lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString