mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Move one Equals implementation to correct base class
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
using SabreTools.Core.Filter;
|
|
||||||
using SabreTools.DatItems.Formats;
|
using SabreTools.DatItems.Formats;
|
||||||
using Xunit;
|
using Xunit;
|
||||||
|
|
||||||
|
|||||||
@@ -174,6 +174,21 @@ namespace SabreTools.DatItems
|
|||||||
return string.Compare(selfName, otherName, StringComparison.Ordinal);
|
return string.Compare(selfName, otherName, StringComparison.Ordinal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
public override bool Equals(ModelBackedItem? other)
|
||||||
|
{
|
||||||
|
// If other is null
|
||||||
|
if (other == null)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// If the type is mismatched
|
||||||
|
if (other is not DatItem otherItem)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Compare internal models
|
||||||
|
return _internal.Equals(otherItem);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Determine if an item is a duplicate using partial matching logic
|
/// Determine if an item is a duplicate using partial matching logic
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -582,21 +597,6 @@ namespace SabreTools.DatItems
|
|||||||
return string.Compare(selfName, otherName, StringComparison.Ordinal);
|
return string.Compare(selfName, otherName, StringComparison.Ordinal);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public override bool Equals(ModelBackedItem? other)
|
|
||||||
{
|
|
||||||
// If other is null
|
|
||||||
if (other == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// If the type is mismatched
|
|
||||||
if (other is not DatItem<T> otherItem)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
// Compare internal models
|
|
||||||
return _internal.Equals(otherItem);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public override bool Equals(ModelBackedItem<Models.Metadata.DatItem>? other)
|
public override bool Equals(ModelBackedItem<Models.Metadata.DatItem>? other)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ namespace SabreTools.DatItems.Formats
|
|||||||
// Otherwise, treat it as a Blank
|
// Otherwise, treat it as a Blank
|
||||||
Blank? newOther = other as Blank;
|
Blank? newOther = other as Blank;
|
||||||
|
|
||||||
// If the archive information matches
|
// If the machine information matches
|
||||||
return GetFieldValue<Machine>(DatItem.MachineKey) == newOther!.GetFieldValue<Machine>(DatItem.MachineKey);
|
return GetFieldValue<Machine>(DatItem.MachineKey) == newOther!.GetFieldValue<Machine>(DatItem.MachineKey);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user