diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 32623fcf..148e7ab4 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -185,20 +185,20 @@ - - packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll + + packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll - - packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - - packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.Toolkit.dll + + packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.Toolkit.dll diff --git a/ENI2/Properties/Resources.Designer.cs b/ENI2/Properties/Resources.Designer.cs index 934f8aa0..c68ddb6e 100644 --- a/ENI2/Properties/Resources.Designer.cs +++ b/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; } diff --git a/ENI2/Service References/LockingServiceReference/Reference.cs b/ENI2/Service References/LockingServiceReference/Reference.cs index e28d8634..310941f9 100644 --- a/ENI2/Service References/LockingServiceReference/Reference.cs +++ b/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"); } diff --git a/ENI2/packages.config b/ENI2/packages.config index df7518bd..b3608115 100644 --- a/ENI2/packages.config +++ b/ENI2/packages.config @@ -4,7 +4,7 @@ Sample license text. --> - + diff --git a/bsmd.database/BKRA.cs b/bsmd.database/BKRA.cs index 393e84ca..6bbddbc4 100644 --- a/bsmd.database/BKRA.cs +++ b/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); } diff --git a/bsmd.database/BRKD.cs b/bsmd.database/BRKD.cs index 4dd1a67c..5581cee1 100644 --- a/bsmd.database/BRKD.cs +++ b/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); } diff --git a/bsmd.database/CREW.cs b/bsmd.database/CREW.cs index 77db177a..f2262bd5 100644 --- a/bsmd.database/CREW.cs +++ b/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); } diff --git a/bsmd.database/CallPurpose.cs b/bsmd.database/CallPurpose.cs index 5a886d38..32318505 100644 --- a/bsmd.database/CallPurpose.cs +++ b/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); } diff --git a/bsmd.database/IBCPosition.cs b/bsmd.database/IBCPosition.cs index 232a8e61..b34f9d1b 100644 --- a/bsmd.database/IBCPosition.cs +++ b/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); } diff --git a/bsmd.database/IGCPosition.cs b/bsmd.database/IGCPosition.cs index c3d51b4e..93fe4a0c 100644 --- a/bsmd.database/IGCPosition.cs +++ b/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); } diff --git a/bsmd.database/IMDGPosition.cs b/bsmd.database/IMDGPosition.cs index 195724cc..84099c60 100644 --- a/bsmd.database/IMDGPosition.cs +++ b/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 Regex unNumberRegex = new Regex(@"^[0-9]{4}$"); + private static readonly Regex imoClassRegex = new Regex(@"^[1-9]{1}(\.[1-9]{1}([A-Z]{1})?)?$"); + 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); } diff --git a/bsmd.database/IMSBCPosition.cs b/bsmd.database/IMSBCPosition.cs index 56832d28..7299a138 100644 --- a/bsmd.database/IMSBCPosition.cs +++ b/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); } diff --git a/bsmd.database/InfectedArea.cs b/bsmd.database/InfectedArea.cs index daeb77a2..d7e7acf0 100644 --- a/bsmd.database/InfectedArea.cs +++ b/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); } diff --git a/bsmd.database/LADG.cs b/bsmd.database/LADG.cs index 5500097d..3f867e8e 100644 --- a/bsmd.database/LADG.cs +++ b/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); } diff --git a/bsmd.database/LastTenPortFacilitiesCalled.cs b/bsmd.database/LastTenPortFacilitiesCalled.cs index 0e3d51ab..6a2f592f 100644 --- a/bsmd.database/LastTenPortFacilitiesCalled.cs +++ b/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); } diff --git a/bsmd.database/MARPOL_Annex_I_Position.cs b/bsmd.database/MARPOL_Annex_I_Position.cs index f6c25e07..89e1b816 100644 --- a/bsmd.database/MARPOL_Annex_I_Position.cs +++ b/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); } diff --git a/bsmd.database/PAS.cs b/bsmd.database/PAS.cs index cc88251f..09b057c8 100644 --- a/bsmd.database/PAS.cs +++ b/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); } diff --git a/bsmd.database/PortOfCallLast30Days.cs b/bsmd.database/PortOfCallLast30Days.cs index 68c36b40..7794f073 100644 --- a/bsmd.database/PortOfCallLast30Days.cs +++ b/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); } diff --git a/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs b/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs index f14b5483..a2f93602 100644 --- a/bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs +++ b/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); } diff --git a/bsmd.database/PortOfItinerary.cs b/bsmd.database/PortOfItinerary.cs index 5731f9ed..700b0327 100644 --- a/bsmd.database/PortOfItinerary.cs +++ b/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); } diff --git a/bsmd.database/SERV.cs b/bsmd.database/SERV.cs index 8c7067bd..29013545 100644 --- a/bsmd.database/SERV.cs +++ b/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); } diff --git a/bsmd.database/STO.cs b/bsmd.database/STO.cs index 13223a12..01748a1f 100644 --- a/bsmd.database/STO.cs +++ b/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); } diff --git a/bsmd.database/SanitaryMeasuresDetail.cs b/bsmd.database/SanitaryMeasuresDetail.cs index 56c15938..630ece8e 100644 --- a/bsmd.database/SanitaryMeasuresDetail.cs +++ b/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); } diff --git a/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs b/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs index 7d73dd61..11a711ab 100644 --- a/bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs +++ b/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); } diff --git a/bsmd.database/StowawaysJoiningLocation.cs b/bsmd.database/StowawaysJoiningLocation.cs index 52bd1b3b..0bb71eb6 100644 --- a/bsmd.database/StowawaysJoiningLocation.cs +++ b/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); } diff --git a/bsmd.database/SubsidiaryRisks.cs b/bsmd.database/SubsidiaryRisks.cs index 722acc86..803ad144 100644 --- a/bsmd.database/SubsidiaryRisks.cs +++ b/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); } diff --git a/bsmd.database/TOWA.cs b/bsmd.database/TOWA.cs index fcff685d..8f599a6f 100644 --- a/bsmd.database/TOWA.cs +++ b/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); } diff --git a/bsmd.database/TOWD.cs b/bsmd.database/TOWD.cs index 2093d662..033d3f70 100644 --- a/bsmd.database/TOWD.cs +++ b/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); } diff --git a/bsmd.database/TreatmentFacilityProvider.cs b/bsmd.database/TreatmentFacilityProvider.cs index eabb5674..ad8cde1c 100644 --- a/bsmd.database/TreatmentFacilityProvider.cs +++ b/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); } diff --git a/bsmd.database/WAS_RCPT.cs b/bsmd.database/WAS_RCPT.cs index fd4ace1f..d386ee0f 100644 --- a/bsmd.database/WAS_RCPT.cs +++ b/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); } diff --git a/bsmd.database/Waste.cs b/bsmd.database/Waste.cs index 7b75b923..8ab257d8 100644 --- a/bsmd.database/Waste.cs +++ b/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); } diff --git a/bsmd.database/WasteDisposalServiceProvider.cs b/bsmd.database/WasteDisposalServiceProvider.cs index 7ad42e7e..c231979e 100644 --- a/bsmd.database/WasteDisposalServiceProvider.cs +++ b/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); } diff --git a/bsmd.database/WasteReceived.cs b/bsmd.database/WasteReceived.cs index 282cdb4d..9c7d4197 100644 --- a/bsmd.database/WasteReceived.cs +++ b/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); }