dschick/git_bsmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare verbessert, Extended.Wpf.Toolkit aktualisiert

Browse Source
This commit is contained in:
Daniel Schick 2023-04-14 06:38:22 +02:00
parent fda2da13d8
commit 0ad92218c2
33 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ENI2/ENI2.csproj
View File

@ -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">
<HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
<Reference Include="Xceed.Wpf.AvalonDock, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<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">
<HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<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">
<HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<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">
<HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
<Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<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">
<HintPath>packages\Extended.Wpf.Toolkit.4.3.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
<Reference Include="Xceed.Wpf.Toolkit, Version=4.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
<HintPath>packages\Extended.Wpf.Toolkit.4.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

2
ENI2/Properties/Resources.Designer.cs generated
View File

@ -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;
}

6
ENI2/Service References/LockingServiceReference/Reference.cs
View File

@ -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");
}

2
ENI2/packages.config
View File

@ -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" />

2
bsmd.database/BKRA.cs
View File

@ -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);
}

2
bsmd.database/BRKD.cs
View File

@ -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);
}

2
bsmd.database/CREW.cs
View File

@ -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);
}

2
bsmd.database/CallPurpose.cs
View File

@ -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);
}

2
bsmd.database/IBCPosition.cs
View File

@ -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);
}

2
bsmd.database/IGCPosition.cs
View File

@ -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);
}

6
bsmd.database/IMDGPosition.cs
View File

@ -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);
}

2
bsmd.database/IMSBCPosition.cs
View File

@ -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);
}

2
bsmd.database/InfectedArea.cs
View File

@ -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);
}

2
bsmd.database/LADG.cs
View File

@ -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);
}

2
bsmd.database/LastTenPortFacilitiesCalled.cs
View File

@ -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);
}

2
bsmd.database/MARPOL_Annex_I_Position.cs
View File

@ -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);
}

2
bsmd.database/PAS.cs
View File

@ -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);
}

2
bsmd.database/PortOfCallLast30Days.cs
View File

@ -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);
}

2
bsmd.database/PortOfCallLast30DaysCrewJoinedShip.cs
View File

@ -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);
}

2
bsmd.database/PortOfItinerary.cs
View File

@ -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);
}

2
bsmd.database/SERV.cs
View File

@ -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);
}

2
bsmd.database/STO.cs
View File

@ -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);
}

2
bsmd.database/SanitaryMeasuresDetail.cs
View File

@ -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);
}

2
bsmd.database/ShipToShipActivitiesDuringLastTenPortFacilitiesCalled.cs
View File

@ -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);
}

2
bsmd.database/StowawaysJoiningLocation.cs
View File

@ -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);
}

2
bsmd.database/SubsidiaryRisks.cs
View File

@ -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);
}

2
bsmd.database/TOWA.cs
View File

@ -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);
}

2
bsmd.database/TOWD.cs
View File

@ -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);
}

2
bsmd.database/TreatmentFacilityProvider.cs
View File

@ -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);
}

2
bsmd.database/WAS_RCPT.cs
View File

@ -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);
}

2
bsmd.database/Waste.cs
View File

@ -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);
}

2
bsmd.database/WasteDisposalServiceProvider.cs
View File

@ -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);
}

2
bsmd.database/WasteReceived.cs
View File

@ -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);
}