Remove Language, Filesystem modules

MultiTool.Common/Documents/DocumentLoader.vb

@@ -9,6 +9,7 @@ Imports MultiTool.Common.Winline.Entities
 Imports MultiTool.Common.Constants
 Imports DigitalData.Modules.Database
 Imports DevExpress.Utils.CommonDialogs
+Imports DigitalData.Modules.Base
 
 Namespace Documents
     Public Class DocumentLoader
@@ -542,7 +543,7 @@ Namespace Documents
 
                                 If IsNothing(oReferencedField) = False Then
                                     Dim oRawValue = oReferencedField.Value?.GetValue(oSubKey)
-                                    Dim oValue As String = Utils.NotNull(oRawValue, String.Empty)
+                                    Dim oValue As String = ObjectEx.NotNull(oRawValue, String.Empty)
 
                                     If oValue <> String.Empty Then
                                         oField.Value.SetExternalValue(oValue)

MultiTool.Common/MultiTool.Common.vbproj

@@ -63,18 +63,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
-    </Reference>
     <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
     </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.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>

MultiTool.Common/Templates/Template.vb

@@ -1,4 +1,4 @@
-Imports DigitalData.Modules.Language
+Imports DigitalData.Modules.Base
 Imports MultiTool.Common.Winline.WinlineData
 
 Namespace Templates
@@ -95,8 +95,8 @@ Namespace Templates
 
 
         Public Function GetParameter(pName As String) As String
-            Dim oParam1 As String = Utils.NotNull(Parameter1, String.Empty)
+            Dim oParam1 As String = ObjectEx.NotNull(Parameter1, String.Empty)
-            Dim oParam2 As String = Utils.NotNull(Parameter2, String.Empty)
+            Dim oParam2 As String = ObjectEx.NotNull(Parameter2, String.Empty)
 
             Dim oParamValue1 = Parameters.TryGet(oParam1, pName)
             Dim oParamValue2 = Parameters.TryGet(oParam2, pName)

MultiTool.Form/MultiTool.Form.vbproj

@@ -112,14 +112,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
-    </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.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>

MultiTool.Form/frmRowEditor.vb

@@ -5,8 +5,8 @@ Imports MultiTool.Common.Winline
 Imports MultiTool.Common.Winline.Entities
 Imports MultiTool.Common.Templates
 Imports MultiTool.Common.Constants
-Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Base
 Imports DevExpress.XtraEditors
 Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraEditors.Controls
@@ -167,7 +167,7 @@ Public Class frmRowEditor
                 End If
 
                 Dim oFieldValue As FieldValue = oField.Value
-                Dim oValueFromGrid As String = Utils.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
+                Dim oValueFromGrid As String = ObjectEx.NotNull(oRow.Item(COL_VALUE_FINAL), String.Empty)
 
                 ' Do the dirtiest date validation of all times
                 If oField.Value.DataType = ColumnType.Date And oValueFromGrid.Length > 0 Then
@@ -293,7 +293,7 @@ Public Class frmRowEditor
     Private Sub GridView1_CustomDrawCell(sender As Object, e As DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell
         Dim oDataRow As DataRow = GridView1.GetDataRow(e.RowHandle)
         Dim oKey As String = oDataRow.Item(COL_KEY)
-        Dim oValue As String = Utils.NotNull(oDataRow.Item(COL_VALUE_FINAL), String.Empty)
+        Dim oValue As String = ObjectEx.NotNull(oDataRow.Item(COL_VALUE_FINAL), String.Empty)
         Dim oColumn = _Table.Columns.
             Where(Function(c) c.Name = oKey).
             SingleOrDefault()