Common: Improve Workspace Class

This commit is contained in:
Jonathan Jenne 2022-07-08 15:22:33 +02:00
parent cf543e7ee9
commit 9193df0dd2
3 changed files with 6 additions and 7 deletions

View File

@ -5,7 +5,6 @@ Namespace DocumentResultList
Public Property WindowLocation As Point Public Property WindowLocation As Point
Public Property WindowSize As Size Public Property WindowSize As Size
Public Property GridFontSizeDelta As Integer = 0 Public Property GridFontSizeDelta As Integer = 0
Public Property SelectedWorkspace As String = Workspace.DEFAULT_WORKSPACE Public Property SelectedWorkspace As String = Workspace(Of Config).DEFAULT_WORKSPACE
End Class End Class
End Namespace End Namespace

View File

@ -8,11 +8,11 @@ Imports DigitalData.Modules.Filesystem
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language
Namespace DocumentResultList Namespace DocumentResultList
Public Class Workspace Public Class Workspace(Of TConfig)
Inherits BaseClass Inherits BaseClass
Private ReadOnly Manager As WorkspaceManager Private ReadOnly Manager As WorkspaceManager
Private ReadOnly Config As ConfigManager(Of Config) Private ReadOnly Config As ConfigManager(Of TConfig)
Private ReadOnly FileEx As File Private ReadOnly FileEx As File
Public Const WORKSPACE_FILENAME As String = "Workspaces.xml" Public Const WORKSPACE_FILENAME As String = "Workspaces.xml"
@ -37,7 +37,7 @@ Namespace DocumentResultList
End Get End Get
End Property End Property
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pWorkspaceManager As WorkspaceManager) Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of TConfig), pWorkspaceManager As WorkspaceManager)
MyBase.New(pLogConfig) MyBase.New(pLogConfig)
Manager = pWorkspaceManager Manager = pWorkspaceManager
Config = pConfigManager Config = pConfigManager

View File

@ -48,7 +48,7 @@ Public Class frmDocumentResultList
Private ReadOnly Params As Params Private ReadOnly Params As Params
Private ReadOnly LayoutManager As Layout Private ReadOnly LayoutManager As Layout
Private ReadOnly FormHelper As FormHelper Private ReadOnly FormHelper As FormHelper
Private ReadOnly Workspace As Workspace Private ReadOnly Workspace As Workspace(Of Config)
Private WithEvents Watcher As Watcher Private WithEvents Watcher As Watcher
' Runtime variables ' Runtime variables
@ -119,7 +119,7 @@ Public Class frmDocumentResultList
GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3}) GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
FileEx = New Modules.Windows.File(pLogConfig) FileEx = New Modules.Windows.File(pLogConfig)
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3}) LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3})
Workspace = New Workspace(pLogConfig, Config, WorkspaceManager1) Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1)
UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US) UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
End Sub End Sub