Windream: Normalize BasePath

Modules.Windream/ConnectionBuilder.vb

@@ -1,5 +1,7 @@
 Imports NLog
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Windream
+Imports DigitalData.Modules.Language
 
 Public Class ConnectionBuilder
     Implements IConnectionBuilder
@@ -61,6 +63,15 @@ Public Class ConnectionBuilder
         Return Me
     End Function
 
+    Public Function WithWindreamObjectsOrDriveLetter(BasePath As String, DriveLetter As String) As IConnectionBuilder Implements IConnectionBuilder.WithWindreamObjectsOrDriveLetter
+        If Utils.NotNull(BasePath, Nothing) IsNot Nothing Then
+            Return WithWindreamObjects(BasePath)
+        ElseIf Utils.NotNull(DriveLetter, Nothing) IsNot Nothing Then
+            Return WithDriveLetter(DriveLetter)
+        Else
+            Return WithWindreamObjects()
+        End If
+    End Function
 
     ''' <summary>
     ''' Sets flag in Windream class to indicate 64-bit support