Value is only part of certain items

This is yet another boilerplate reduction AS WELL AS a reduction for unnecessary field names (mostly due to my misunderstanding of my own implementation)
This commit is contained in:
Matt Nadareski
2020-09-03 11:48:30 -07:00
parent 47c2c1d227
commit 6f72416947
40 changed files with 119 additions and 191 deletions

View File

@@ -128,11 +128,6 @@ namespace SabreTools.Library.Filtering
public FilterItem<string> DatItem_Feature_Name { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_Feature_Value { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_AreaName { get; private set; } = new FilterItem<string>();
public FilterItem<long?> DatItem_AreaSize { get; private set; } = new FilterItem<long?>() { Positive = null, Negative = null, Neutral = null };
public FilterItem<string> DatItem_AreaWidth { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_AreaEndianness { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_Value { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_LoadFlag { get; private set; } = new FilterItem<string>();
#endregion
@@ -161,6 +156,13 @@ namespace SabreTools.Library.Filtering
public FilterItem<bool?> DatItem_Optional { get; private set; } = new FilterItem<bool?>() { Neutral = null };
public FilterItem<bool?> DatItem_Inverted { get; private set; } = new FilterItem<bool?>();
// Rom (SoftwareList)
public FilterItem<string> DatItem_AreaName { get; private set; } = new FilterItem<string>();
public FilterItem<long?> DatItem_AreaSize { get; private set; } = new FilterItem<long?>() { Positive = null, Negative = null, Neutral = null };
public FilterItem<string> DatItem_AreaWidth { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_AreaEndianness { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_Value { get; private set; } = new FilterItem<string>();
// Disk
public FilterItem<string> DatItem_Index { get; private set; } = new FilterItem<string>();
public FilterItem<bool?> DatItem_Writable { get; private set; } = new FilterItem<bool?>() { Neutral = null };
@@ -190,7 +192,6 @@ namespace SabreTools.Library.Filtering
// Condition
public FilterItem<string> DatItem_Relation { get; private set; } = new FilterItem<string>();
public FilterItem<string> DatItem_ConditionValue { get; private set; } = new FilterItem<string>();
// Configuration.Locations
public FilterItem<bool?> DatItem_Locations { get; private set; } = new FilterItem<bool?>() { Neutral = null };
@@ -251,9 +252,6 @@ namespace SabreTools.Library.Filtering
public FilterItem<FeatureStatus> DatItem_FeatureStatus { get; private set; } = new FilterItem<FeatureStatus>() { Positive = FeatureStatus.NULL, Negative = FeatureStatus.NULL };
public FilterItem<FeatureStatus> DatItem_FeatureOverall { get; private set; } = new FilterItem<FeatureStatus>() { Positive = FeatureStatus.NULL, Negative = FeatureStatus.NULL };
// Info
public FilterItem<string> DatItem_InfoValue { get; private set; } = new FilterItem<string>();
// Input
public FilterItem<bool?> DatItem_Service { get; private set; } = new FilterItem<bool?>() { Neutral = null };
public FilterItem<bool?> DatItem_Tilt { get; private set; } = new FilterItem<bool?>() { Neutral = null };
@@ -285,9 +283,6 @@ namespace SabreTools.Library.Filtering
// Release
public FilterItem<string> DatItem_Language { get; private set; } = new FilterItem<string>();
// SharedFeature
public FilterItem<string> DatItem_SharedFeatureValue { get; private set; } = new FilterItem<string>();
// Slots.SlotOptions
public FilterItem<bool?> DatItem_SlotOptions { get; private set; } = new FilterItem<bool?>() { Neutral = null };
public FilterItem<string> DatItem_SlotOption_Name { get; private set; } = new FilterItem<string>();
@@ -1140,13 +1135,6 @@ namespace SabreTools.Library.Filtering
DatItem_Relation.PositiveSet.Add(value);
break;
case Field.DatItem_ConditionValue:
if (negate)
DatItem_ConditionValue.NegativeSet.Add(value);
else
DatItem_ConditionValue.PositiveSet.Add(value);
break;
// Configurations.Locations
case Field.DatItem_Locations:
if (negate || value.Equals("false", StringComparison.OrdinalIgnoreCase))
@@ -1443,14 +1431,6 @@ namespace SabreTools.Library.Filtering
DatItem_FeatureOverall.Positive |= value.AsFeatureStatus();
break;
// Info
case Field.DatItem_InfoValue:
if (negate)
DatItem_InfoValue.NegativeSet.Add(value);
else
DatItem_InfoValue.PositiveSet.Add(value);
break;
// Input
case Field.DatItem_Service:
if (negate || value.Equals("false", StringComparison.OrdinalIgnoreCase))
@@ -1603,14 +1583,6 @@ namespace SabreTools.Library.Filtering
DatItem_Language.PositiveSet.Add(value);
break;
// SharedFeature
case Field.DatItem_SharedFeatureValue:
if (negate)
DatItem_SharedFeatureValue.NegativeSet.Add(value);
else
DatItem_SharedFeatureValue.PositiveSet.Add(value);
break;
// Slots.SlotOptions
case Field.DatItem_SlotOptions:
if (negate || value.Equals("false", StringComparison.OrdinalIgnoreCase))