Move more to the DatItem base class

This commit is contained in:
Matt Nadareski
2023-08-14 22:33:05 -04:00
parent 6adbe601a2
commit ed1f809065
41 changed files with 708 additions and 1310 deletions

View File

@@ -21,8 +21,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureType Type
{
get => _feature.ReadString(Models.Internal.Feature.FeatureTypeKey).AsFeatureType();
set => _feature[Models.Internal.Feature.FeatureTypeKey] = value.FromFeatureType();
get => _internal.ReadString(Models.Internal.Feature.FeatureTypeKey).AsFeatureType();
set => _internal[Models.Internal.Feature.FeatureTypeKey] = value.FromFeatureType();
}
[JsonIgnore]
@@ -35,8 +35,8 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureStatus Status
{
get => _feature.ReadString(Models.Internal.Feature.StatusKey).AsFeatureStatus();
set => _feature[Models.Internal.Feature.StatusKey] = value.FromFeatureStatus();
get => _internal.ReadString(Models.Internal.Feature.StatusKey).AsFeatureStatus();
set => _internal[Models.Internal.Feature.StatusKey] = value.FromFeatureStatus();
}
[JsonIgnore]
@@ -49,19 +49,13 @@ namespace SabreTools.DatItems.Formats
[JsonConverter(typeof(StringEnumConverter))]
public FeatureStatus Overall
{
get => _feature.ReadString(Models.Internal.Feature.OverallKey).AsFeatureStatus();
set => _feature[Models.Internal.Feature.OverallKey] = value.FromFeatureStatus();
get => _internal.ReadString(Models.Internal.Feature.OverallKey).AsFeatureStatus();
set => _internal[Models.Internal.Feature.OverallKey] = value.FromFeatureStatus();
}
[JsonIgnore]
public bool OverallSpecified { get { return Overall != FeatureStatus.NULL; } }
/// <summary>
/// Internal Feature model
/// </summary>
[JsonIgnore]
private Models.Internal.Feature _feature = new();
#endregion
#region Constructors
@@ -71,6 +65,7 @@ namespace SabreTools.DatItems.Formats
/// </summary>
public Feature()
{
_internal = new Models.Internal.Feature();
ItemType = ItemType.Feature;
}
@@ -90,25 +85,10 @@ namespace SabreTools.DatItems.Formats
Source = this.Source?.Clone() as Source,
Remove = this.Remove,
_feature = this._feature?.Clone() as Models.Internal.Feature ?? new Models.Internal.Feature(),
_internal = this._internal?.Clone() as Models.Internal.Feature ?? new Models.Internal.Feature(),
};
}
#endregion
#region Comparision Methods
/// <inheritdoc/>
public override bool Equals(DatItem? other)
{
// If we don't have a Feature, return false
if (ItemType != other?.ItemType || other is not Feature otherInternal)
return false;
// Compare the internal models
return _feature.EqualTo(otherInternal._feature);
}
#endregion
}
}