Compare verbessert, Extended.Wpf.Toolkit aktualisiert

ENI2/ENI2.csproj

@@ -185,20 +185,20 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=4.3.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+    <Reference Include="Xceed.Wpf.Toolkit, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+      <HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

ENI2/Properties/Resources.Designer.cs

@@ -38,7 +38,7 @@ namespace ENI2.Properties {
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+                if (ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ENI2.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }

ENI2/Service References/LockingServiceReference/Reference.cs

@@ -117,7 +117,7 @@ namespace ENI2.LockingServiceReference {
                 return this.CORRUPTFilesField;
             }
             set {
-                if ((object.ReferenceEquals(this.CORRUPTFilesField, value) != true)) {
+                if ((ReferenceEquals(this.CORRUPTFilesField, value) != true)) {
                     this.CORRUPTFilesField = value;
                     this.RaisePropertyChanged("CORRUPTFiles");
                 }
@@ -143,7 +143,7 @@ namespace ENI2.LockingServiceReference {
                 return this.IMPFilesField;
             }
             set {
-                if ((object.ReferenceEquals(this.IMPFilesField, value) != true)) {
+                if ((ReferenceEquals(this.IMPFilesField, value) != true)) {
                     this.IMPFilesField = value;
                     this.RaisePropertyChanged("IMPFiles");
                 }
@@ -156,7 +156,7 @@ namespace ENI2.LockingServiceReference {
                 return this.READYFilesField;
             }
             set {
-                if ((object.ReferenceEquals(this.READYFilesField, value) != true)) {
+                if ((ReferenceEquals(this.READYFilesField, value) != true)) {
                     this.READYFilesField = value;
                     this.RaisePropertyChanged("READYFiles");
                 }

ENI2/packages.config

@@ -4,7 +4,7 @@ Sample license text.
 -->
 <packages>
   <package id="ExcelDataReader" version="3.6.0" targetFramework="net452" />
-  <package id="Extended.Wpf.Toolkit" version="4.3.0" targetFramework="net48" />
+  <package id="Extended.Wpf.Toolkit" version="4.5.0" targetFramework="net48" />
   <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1001" targetFramework="net48" />
   <package id="PDFsharp-MigraDoc-gdi" version="1.50.5147" targetFramework="net452" />

bsmd.database/BKRA.cs

@@ -145,7 +145,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((BRKA)obj).Identifier);
         }

bsmd.database/BRKD.cs

@@ -144,7 +144,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((BRKD)obj).Identifier);
         }

bsmd.database/CREW.cs

@@ -381,7 +381,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((CREW)obj).Identifier);
         }

bsmd.database/CallPurpose.cs

@@ -133,7 +133,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((CallPurpose)obj).Identifier);
         }

bsmd.database/IBCPosition.cs

@@ -314,7 +314,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((IBCPosition)obj).Identifier);
         }

bsmd.database/IGCPosition.cs

@@ -214,7 +214,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((IGCPosition)obj).Identifier);
         }

bsmd.database/IMDGPosition.cs

@@ -30,8 +30,8 @@ namespace bsmd.database
 
         #region static Regex
 
-        private static Regex imoClassRegex = new Regex(@"^[1-9]{1}(\.[1-9]{1}([A-Z]{1})?)?$");
+        private static readonly Regex imoClassRegex = new Regex(@"^[1-9]{1}(\.[1-9]{1}([A-Z]{1})?)?$");
-        private static Regex unNumberRegex = new Regex(@"^[0-9]{4}$");
+        private static readonly Regex unNumberRegex = new Regex(@"^[0-9]{4}$");
 
         #endregion
 
@@ -627,7 +627,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((IMDGPosition)obj).Identifier);
         }

bsmd.database/IMSBCPosition.cs

@@ -262,7 +262,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((IMSBCPosition)obj).Identifier);
         }

bsmd.database/InfectedArea.cs

@@ -122,7 +122,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((InfectedArea)obj).Identifier);
         }

bsmd.database/LADG.cs

@@ -242,7 +242,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((LADG)obj).Identifier);
         }

bsmd.database/LastTenPortFacilitiesCalled.cs

@@ -201,7 +201,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((LastTenPortFacilitiesCalled)obj).Identifier);
         }

bsmd.database/MARPOL_Annex_I_Position.cs

@@ -227,7 +227,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((MARPOL_Annex_I_Position)obj).Identifier);
         }

bsmd.database/PAS.cs

@@ -436,7 +436,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((PAS)obj).Identifier);
         }

bsmd.database/PortOfCallLast30Days.cs

@@ -300,7 +300,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((PortOfCallLast30Days)obj).Identifier);
         }

bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs

@@ -120,7 +120,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((PortOfCallLast30DaysCrewJoinedShip)obj).Identifier);
         }

bsmd.database/PortOfItinerary.cs

@@ -129,7 +129,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((PortOfItinerary)obj).Identifier);
         }

bsmd.database/SERV.cs

@@ -131,7 +131,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((SERV)obj).Identifier);
         }

bsmd.database/STO.cs

@@ -147,7 +147,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((STO)obj).Identifier);
         }

bsmd.database/SanitaryMeasuresDetail.cs

@@ -141,7 +141,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((SanitaryMeasuresDetail)obj).Identifier);
         }

bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs

@@ -234,7 +234,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((ShipToShipActivitiesDuringLastTenPortFacilitiesCalled)obj).Identifier);
         }

bsmd.database/StowawaysJoiningLocation.cs

@@ -115,7 +115,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((StowawaysJoiningLocation)obj).Identifier);
         }

bsmd.database/SubsidiaryRisks.cs

@@ -108,7 +108,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((SubsidiaryRisks)obj).Identifier);
         }

bsmd.database/TOWA.cs

@@ -271,7 +271,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((TOWA)obj).Identifier);
         }

bsmd.database/TOWD.cs

@@ -254,7 +254,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((TOWD)obj).Identifier);
         }

bsmd.database/TreatmentFacilityProvider.cs

@@ -104,7 +104,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((TreatmentFacilityProvider)obj).Identifier);
         }

bsmd.database/WAS_RCPT.cs

@@ -421,7 +421,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((WAS_RCPT)obj).Identifier);
         }

bsmd.database/Waste.cs

@@ -285,7 +285,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((Waste)obj).Identifier);
         }

bsmd.database/WasteDisposalServiceProvider.cs

@@ -116,7 +116,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((WasteDisposalServiceProvider)obj).Identifier);
         }

bsmd.database/WasteReceived.cs

@@ -146,7 +146,7 @@ namespace bsmd.database
 
         public int CompareTo(object obj)
         {
-            if (object.ReferenceEquals(obj, null))
+            if (obj is null)
                 return 1;
             return this.Identifier.CompareTo(((WasteReceived)obj).Identifier);
         }