diff --git a/DDMonorepo.sln b/DDMonorepo.sln index 0aee69ab..e05a6c7b 100644 --- a/DDMonorepo.sln +++ b/DDMonorepo.sln @@ -11,15 +11,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setups", "Setups", "{D887B4 EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMDesigner", "EDMDesigner\EDMDesigner.vbproj", "{5284F4E5-A6C1-4BCF-896F-3ABEA985B741}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Modules.Logging", "Modules.Logging\Modules.Logging.vbproj", "{903B2D7D-3B80-4BE9-8713-7447B704E1B0}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Logging", "Modules.Logging\Logging.vbproj", "{903B2D7D-3B80-4BE9-8713-7447B704E1B0}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Modules.Windream", "Modules.Windream\Modules.Windream.vbproj", "{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Windream", "Modules.Windream\Windream.vbproj", "{4C86DF8F-A280-40D4-85B0-10B1BF66C15C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{7AF3F9C2-C939-4A08-95C1-0453207E298A}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestGUI", "TestGUI\TestGUI.vbproj", "{93130E7D-A950-4CBD-A0D9-7A6FAF94DDC0}" EndProject -Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Modules.Database", "Modules.Database\Modules.Database.vbproj", "{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}" +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Database", "Modules.Database\Database.vbproj", "{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}" EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Messaging", "Message\Messaging.vbproj", "{AF664D85-0A4B-4BAB-A2F8-83110C06553A}" EndProject diff --git a/EDMDesigner/ClassCurrentUser.vb b/EDMDesigner/ClassCurrentUser.vb index 434d4359..de23b5dd 100644 --- a/EDMDesigner/ClassCurrentUser.vb +++ b/EDMDesigner/ClassCurrentUser.vb @@ -1,4 +1,4 @@ -Imports Modules.Database +Imports DigitalData.Modules.Database Public Class ClassCurrentUser Public Username As String diff --git a/EDMDesigner/EDMDesigner.vbproj b/EDMDesigner/EDMDesigner.vbproj index fe51fd3f..07af393a 100644 --- a/EDMDesigner/EDMDesigner.vbproj +++ b/EDMDesigner/EDMDesigner.vbproj @@ -76,7 +76,7 @@ - ..\Modules.Database\bin\Debug\Modules.Database.dll + ..\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll ..\packages\NLog.4.5.8\lib\net45\NLog.dll @@ -188,13 +188,13 @@ - + {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Modules.Logging + Logging - + {4c86df8f-a280-40d4-85b0-10b1bf66c15c} - Modules.Windream + Windream diff --git a/EDMDesigner/FrmMain.vb b/EDMDesigner/FrmMain.vb index 3cf6253a..461b6c1f 100644 --- a/EDMDesigner/FrmMain.vb +++ b/EDMDesigner/FrmMain.vb @@ -1,5 +1,5 @@ -Imports Modules.Database -Imports Modules.Logging +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging Public Class FrmMain Private SelectedTable As Integer diff --git a/Modules.Database/Modules.Database.vbproj b/Modules.Database/Database.vbproj similarity index 95% rename from Modules.Database/Modules.Database.vbproj rename to Modules.Database/Database.vbproj index 8d5785d0..1f6b691a 100644 --- a/Modules.Database/Modules.Database.vbproj +++ b/Modules.Database/Database.vbproj @@ -6,8 +6,8 @@ AnyCPU {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} Library - Modules.Database - Modules.Database + DigitalData.Modules.Database + DigitalData.Modules.Database 512 Windows v4.6.1 @@ -18,7 +18,7 @@ true true bin\Debug\ - Modules.Database.xml + DigitalData.Modules.Database.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -27,7 +27,7 @@ true true bin\Release\ - Modules.Database.xml + DigitalData.Modules.Database.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 diff --git a/Modules.Database/My Project/Application.Designer.vb b/Modules.Database/My Project/Application.Designer.vb index 88dd01c7..8ab460ba 100644 --- a/Modules.Database/My Project/Application.Designer.vb +++ b/Modules.Database/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/Modules.Database/My Project/Resources.Designer.vb b/Modules.Database/My Project/Resources.Designer.vb index bd038aeb..975b72a9 100644 --- a/Modules.Database/My Project/Resources.Designer.vb +++ b/Modules.Database/My Project/Resources.Designer.vb @@ -1,60 +1,61 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Modules.Database.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Database.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/Modules.Database/My Project/Settings.Designer.vb b/Modules.Database/My Project/Settings.Designer.vb index 990e4633..50b18d21 100644 --- a/Modules.Database/My Project/Settings.Designer.vb +++ b/Modules.Database/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.Modules.Database.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Database.My.MySettings Get - Return Global.Modules.Database.My.MySettings.Default + Return Global.DigitalData.Modules.Database.My.MySettings.Default End Get End Property End Module diff --git a/Modules.Logging/Modules.Logging.vbproj b/Modules.Logging/Logging.vbproj similarity index 94% rename from Modules.Logging/Modules.Logging.vbproj rename to Modules.Logging/Logging.vbproj index 75695712..4b888003 100644 --- a/Modules.Logging/Modules.Logging.vbproj +++ b/Modules.Logging/Logging.vbproj @@ -6,8 +6,8 @@ AnyCPU {903B2D7D-3B80-4BE9-8713-7447B704E1B0} Library - Modules.Logging - Modules.Logging + DigitalData.Modules.Logging + DigitalData.Modules.Logging 512 Windows v4.6.1 @@ -18,7 +18,7 @@ true true bin\Debug\ - Modules.Logging.xml + DigitalData.Modules.Logging.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -27,7 +27,7 @@ true true bin\Release\ - Modules.Logging.xml + DigitalData.Modules.Logging.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 diff --git a/Modules.Logging/My Project/Application.Designer.vb b/Modules.Logging/My Project/Application.Designer.vb index 88dd01c7..8ab460ba 100644 --- a/Modules.Logging/My Project/Application.Designer.vb +++ b/Modules.Logging/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/Modules.Logging/My Project/Resources.Designer.vb b/Modules.Logging/My Project/Resources.Designer.vb index adb6e7d3..200685a0 100644 --- a/Modules.Logging/My Project/Resources.Designer.vb +++ b/Modules.Logging/My Project/Resources.Designer.vb @@ -1,60 +1,61 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Modules.Logging.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Logging.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/Modules.Logging/My Project/Settings.Designer.vb b/Modules.Logging/My Project/Settings.Designer.vb index 92b0a2a3..4fcffacd 100644 --- a/Modules.Logging/My Project/Settings.Designer.vb +++ b/Modules.Logging/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.Modules.Logging.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Logging.My.MySettings Get - Return Global.Modules.Logging.My.MySettings.Default + Return Global.DigitalData.Modules.Logging.My.MySettings.Default End Get End Property End Module diff --git a/Modules.Windream/My Project/Application.Designer.vb b/Modules.Windream/My Project/Application.Designer.vb index 88dd01c7..8ab460ba 100644 --- a/Modules.Windream/My Project/Application.Designer.vb +++ b/Modules.Windream/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/Modules.Windream/My Project/Resources.Designer.vb b/Modules.Windream/My Project/Resources.Designer.vb index 30090d5d..e5304217 100644 --- a/Modules.Windream/My Project/Resources.Designer.vb +++ b/Modules.Windream/My Project/Resources.Designer.vb @@ -1,60 +1,61 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ Option Strict On Option Explicit On +Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ + _ Friend Module Resources - + Private resourceMan As Global.System.Resources.ResourceManager - + Private resourceCulture As Global.System.Globalization.CultureInfo - + ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' - _ + _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Get If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Modules.Windream.Resources", GetType(Resources).Assembly) + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("DigitalData.Modules.Windream.Resources", GetType(Resources).Assembly) resourceMan = temp End If Return resourceMan End Get End Property - + ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' - _ + _ Friend Property Culture() As Global.System.Globalization.CultureInfo Get Return resourceCulture End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) + Set resourceCulture = value End Set End Property diff --git a/Modules.Windream/My Project/Settings.Designer.vb b/Modules.Windream/My Project/Settings.Designer.vb index 980e1a4f..fca08ef3 100644 --- a/Modules.Windream/My Project/Settings.Designer.vb +++ b/Modules.Windream/My Project/Settings.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -13,42 +13,42 @@ Option Explicit On Namespace My - - _ + + _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) - -#Region "My.Settings Auto-Save Functionality" + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + +#Region "Automatische My.Settings-Speicherfunktion" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - + Public Shared ReadOnly Property [Default]() As MySettings Get - + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance End Get @@ -64,9 +64,9 @@ Namespace My Friend Module MySettingsProperty _ - Friend ReadOnly Property Settings() As Global.Modules.Windream.My.MySettings + Friend ReadOnly Property Settings() As Global.DigitalData.Modules.Windream.My.MySettings Get - Return Global.Modules.Windream.My.MySettings.Default + Return Global.DigitalData.Modules.Windream.My.MySettings.Default End Get End Property End Module diff --git a/Modules.Windream/Windream.vb b/Modules.Windream/Windream.vb index c9c20bc6..a327fc2e 100644 --- a/Modules.Windream/Windream.vb +++ b/Modules.Windream/Windream.vb @@ -6,122 +6,129 @@ Imports WINDREAMLib.WMSearchOperator Imports WINDREAMLib.WMSearchRelation Imports WMOBRWSLib Imports WMOSRCHLib +Imports WMCNNCTDLLLib Public Class Windream Inherits Constants #Region "+++++ Variables +++++" Private Shared Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger Public CurrentSession = Nothing - Public CurrentSessionIsLoggedIn As Boolean = False - Private CurrentObjecttypes As WINDREAMLib.WMObjects + Private CurrentController As WMOSearchController Private Shared CurrentWMConnect ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht) Public CurrentWMServer As String Private WMDriveLetter As String = "W" - Private _Session_Reconnect As Boolean = False + + ' New + Private ServerBrowser As IServerBrowser + Private Session As IWMSession6 + Private Connect As IWMConnect2 + + Private CurrentServer As String + Private CurrentObjecttypes As WMObjects + + Private ReconnectSession As Boolean + Private DriveLetter As String + + Public LoggedInSession As Boolean = False #End Region #Region "+++++ Init +++++" ''' ''' Initializes windream and creates a windream session with the actual user ''' ''' - Public Sub New(WMDRIVE As String, SessionReconnect As Boolean) + Public Sub New(Optional DriveLetter As String = "W", Optional ReconnectSession As Boolean = False) Try - WMDriveLetter = WMDRIVE - NewSession() + Me.DriveLetter = DriveLetter + Me.ReconnectSession = ReconnectSession + + If Not NewSession() Then + Logger.Warn("Session could not be created") + End If + + CurrentObjecttypes = GetObjectTypes() + Catch ex As Exception Logger.Error(ex) End Try End Sub + + Private Function GetObjectTypes() As WMObjects + Dim objectTypes As WMObjects + + Try + objectTypes = Session.GetWMObjectTypes(WMEntityDocument) + Return objectTypes + Catch ex As Exception + Logger.Error(ex) + Return Nothing + End Try + End Function + + Private Function NormalizePath(path As String) + Dim normalizedPath = path + + If Not path.StartsWith("\") And path.ToUpper().StartsWith(DriveLetter.ToUpper) Then + normalizedPath = path.Substring(2) + End If + + Return normalizedPath + End Function + ''' ''' Creates a windream session with the actual user ''' ''' Returns true when created, false if not ''' - Public Function NewSession() + Public Function NewSession() As Boolean Try - Dim wmbrwsr - wmbrwsr = CreateObject("WMOBrws.ServerBrowser") - '================================================================== - ' get the current DMS-server to log in - '================================================================== - CurrentWMServer = wmbrwsr.GetCurrentServer - Logger.Info("ECMServer: " & CurrentWMServer) - Dim Connect - Try - Connect = CreateObject("Windream.WMConnect") - Logger.Info("...connected to windream!") - Catch ex As Exception - CurrentSession = Nothing - CurrentSessionIsLoggedIn = False - Logger.Error(ex) - Return False - End Try - '================================================================== - ' create a session - '================================================================== - 'Prüfen ob sich personifiziert angemeldet werden muss? - Try - CurrentSession = CreateObject("Windream.WMSession", CurrentWMServer) - Catch ex As Exception - CurrentSession = Nothing - CurrentSessionIsLoggedIn = False - Logger.Error(ex) - Return False - End Try - '================================================================== - ' login session - '================================================================== - Try - Connect.LoginSession(CurrentSession) - If CurrentSession.aLoggedin Then - CurrentWMConnect = Connect - CurrentSessionIsLoggedIn = True - Logger.Info("UserSession has been created!") - Try - 'Standardmässig hinterlegen dass abgelegte Dateien keine Indexmaske öffnet - CurrentSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False) - ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine - ' Ordnertypen ausgelesen werden - CurrentObjecttypes = CurrentSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) - Catch ex As Exception - Logger.Error(ex) - 'clsLogger.Add("Could not get Objecttypes: " & ex.Message, True) - End Try - Return True - Else - CurrentSessionIsLoggedIn = False - Logger.Warn("Session could be built but user cannot be logged in!") - Return False - End If - Catch ex As Exception - If Not IsNothing(CurrentSession) Then - If CurrentSession.aLoggedin Then - Logger.Info("User is already logged in!....") - CurrentSessionIsLoggedIn = True - Else - CurrentSessionIsLoggedIn = False - End If - Return True - Else - Logger.Error(ex) - CurrentSession = Nothing - CurrentSessionIsLoggedIn = False - Return False - End If - End Try + ServerBrowser = New ServerBrowser() Catch ex As Exception - CurrentSession = Nothing - CurrentSessionIsLoggedIn = False - Logger.Error(ex) - 'clsLogger.Add("Unexpected Error in Create Session: " & ex.Message, True) + Logger.Error(ex, "Could not create ServerBrowser") Return False End Try + + Try + ' Create Connect Object for Session + Connect = New WMConnect With { + .ModuleId = 9 + } + Catch ex As Exception + Logger.Error(ex, "Could not create WMConnect") + Return False + End Try + + Try + Session = New WMSession() + Catch ex As Exception + Logger.Error(ex, "Could not create WMConnect") + Return False + End Try + + Try + Connect.LoginSession(Session) + LoggedInSession = True + Catch ex As Exception + Logger.Error(ex, "Could not login session") + Return False + End Try + + Try + ' Standardmässig hinterlegen dass abgelegte Dateien keine Indexmaske öffnet + Session.SwitchEvents(WMCOMEventWMSessionNeedIndex, False) + Catch ex As Exception + Logger.Error(ex, "Could not SwitchEvents") + Return False + End Try + + If Not Session.aLoggedin Then + Logger.Warn("Session created but user {0} could not be logged in", Environment.UserName) + Return False + End If + + Return True End Function #End Region #Region "+++++ New +++++" - Public Function NewFile() - - End Function ''' ''' Creates a folder in windream. All folder-parts will be checked ''' @@ -130,9 +137,8 @@ Public Class Windream ''' Public Function NewFolder(ByVal folderpath As String) Try - If folderpath.StartsWith("\") = False And folderpath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - folderpath = folderpath.Substring(2) - End If + folderpath = NormalizePath(folderpath) + Dim folders() As String = folderpath.Split("\") For Each folder As String In folders Dim WMObject As WINDREAMLib.WMObject @@ -357,9 +363,7 @@ Public Class Windream Try Dim result As Boolean = False Dim WMFolder As WINDREAMLib.WMObject - If folderpath.StartsWith("\") = False And folderpath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - folderpath = folderpath.Substring(2) - End If + folderpath = NormalizePath(folderpath) If TestFolderExists(folderpath) = True Then WMFolder = CurrentSession.GetWMObjectByPath(WMEntityFolder, folderpath) @@ -414,9 +418,7 @@ Public Class Windream ''' Public Function NewVersion(ByVal WMPath As String, ByVal Comment As String) Try - If WMPath.StartsWith("\") = False And WMPath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - WMPath = WMPath.Substring(2) - End If + WMPath = NormalizePath(WMPath) Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject") 'New WINDREAMLib.WMObject Try @@ -638,8 +640,8 @@ Public Class Windream oSearch = srchObjectType.GetSearch() Case Else - MsgBox("KEIN GÜLTIGER WINDREAM-SUCHTYP") - Return Nothing + Logger.Warn("No valid WM-SearchType") + Return dt End Select Dim WMObjects As Object WMObjects = oSearch.Execute @@ -803,9 +805,7 @@ Public Class Windream ''' Public Function GetWMObjectForFile(ByVal WMPath As String) As WMObject Try - If WMPath.StartsWith("\") = False And WMPath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - WMPath = WMPath.Substring(2) - End If + WMPath = NormalizePath(WMPath) Dim oWMObject As WINDREAMLib.WMObject Try oWMObject = CurrentSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WMPath) @@ -829,9 +829,7 @@ Public Class Windream ''' Public Function TestFolderExists(folderpath As String) Try - If folderpath.StartsWith("\") = False And folderpath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - folderpath = folderpath.Substring(2) - End If + folderpath = NormalizePath(folderpath) Try Dim exists = CurrentSession.WMObjectExists(WMEntityFolder, folderpath, 0, 0) Return exists @@ -851,9 +849,7 @@ Public Class Windream ''' Public Function TestFileExists(ByVal WMPath As String) Try - If WMPath.StartsWith("\") = False And WMPath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - WMPath = WMPath.Substring(2) - End If + WMPath = NormalizePath(WMPath) Try Dim WMObject As WINDREAMLib.WMObject = CurrentSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WMPath) Catch ex As Exception @@ -888,9 +884,7 @@ Public Class Windream ''' Public Function RemFile(ByVal WMPath As String) Try - If WMPath.StartsWith("\") = False And WMPath.ToUpper.StartsWith(WMDriveLetter.ToUpper) Then - WMPath = WMPath.Substring(2) - End If + WMPath = NormalizePath(WMPath) Dim oWMObject = GetWMObjectForFile(WMPath) If IsNothing(oWMObject) = False Then oWMObject.Delete() diff --git a/Modules.Windream/Modules.Windream.vbproj b/Modules.Windream/Windream.vbproj similarity index 91% rename from Modules.Windream/Modules.Windream.vbproj rename to Modules.Windream/Windream.vbproj index d8b4b6ca..e3ac90bb 100644 --- a/Modules.Windream/Modules.Windream.vbproj +++ b/Modules.Windream/Windream.vbproj @@ -6,8 +6,8 @@ AnyCPU {4C86DF8F-A280-40D4-85B0-10B1BF66C15C} Library - Modules.Windream - Modules.Windream + DigitalData.Modules.Windream + DigitalData.Modules.Windream 512 Windows v4.6.1 @@ -18,7 +18,7 @@ true true bin\Debug\ - Modules.Windream.xml + DigitalData.Modules.Windream.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -27,7 +27,7 @@ true true bin\Release\ - Modules.Windream.xml + DigitalData.Modules.Windream.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -47,6 +47,10 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll False + + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMCNNCTDLLLib.dll + True + P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll True diff --git a/TestGUI/Form1.vb b/TestGUI/Form1.vb index 64ec96c3..505bb3e8 100644 --- a/TestGUI/Form1.vb +++ b/TestGUI/Form1.vb @@ -1,11 +1,12 @@ -Imports Modules.Windream -Imports Modules.Logging +Imports DigitalData.Modules.Windream +Imports DigitalData.Modules.Logging + Public Class Form1 Dim MyLogger As Logger Protected _windream As Windream Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click _windream = New Windream("W", True) - If _windream.CurrentSessionIsLoggedIn = True Then + If _windream.LoggedInSession = True Then MsgBox("Session created") Else MsgBox("No session created") diff --git a/TestGUI/TestGUI.vbproj b/TestGUI/TestGUI.vbproj index 002a5f1c..f5fd8db4 100644 --- a/TestGUI/TestGUI.vbproj +++ b/TestGUI/TestGUI.vbproj @@ -55,9 +55,6 @@ - - ..\Modules.Windream\bin\Debug\Modules.Windream.dll - ..\packages\NLog.4.5.8\lib\net45\NLog.dll @@ -143,9 +140,13 @@ - + {903b2d7d-3b80-4be9-8713-7447b704e1b0} - Modules.Logging + Logging + + + {4c86df8f-a280-40d4-85b0-10b1bf66c15c} + Windream