claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce DatItem boilerplate

Browse Source
This commit is contained in:
Matt Nadareski
2020-09-08 10:56:37 -07:00
parent f0afe33dd7
commit d8835920a7
35 changed files with 202 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
SabreTools.Library/DatItems/Condition.cs
View File

@@ -186,15 +186,11 @@ namespace SabreTools.Library.DatItems
if (sub)
{
// Filter on tag
if (filter.DatItem_Condition_Tag.MatchesPositiveSet(Tag) == false)
return false;
if (filter.DatItem_Condition_Tag.MatchesNegativeSet(Tag) == true)
if (!PassStringFilter(filter.DatItem_Condition_Tag, Tag))
return false;
// Filter on mask
if (filter.DatItem_Condition_Mask.MatchesPositiveSet(Mask) == false)
return false;
if (filter.DatItem_Condition_Mask.MatchesNegativeSet(Mask) == true)
if (!PassStringFilter(filter.DatItem_Condition_Mask, Mask))
return false;
// Filter on relation
@@ -204,23 +200,17 @@ namespace SabreTools.Library.DatItems
return false;
// Filter on value
if (filter.DatItem_Condition_Value.MatchesPositiveSet(Value) == false)
return false;
if (filter.DatItem_Condition_Value.MatchesNegativeSet(Value) == true)
if (!PassStringFilter(filter.DatItem_Condition_Value, Value))
return false;
}
else
{
// Filter on tag
if (filter.DatItem_Tag.MatchesPositiveSet(Tag) == false)
return false;
if (filter.DatItem_Tag.MatchesNegativeSet(Tag) == true)
if (!PassStringFilter(filter.DatItem_Tag, Tag))
return false;
// Filter on mask
if (filter.DatItem_Mask.MatchesPositiveSet(Mask) == false)
return false;
if (filter.DatItem_Mask.MatchesNegativeSet(Mask) == true)
if (!PassStringFilter(filter.DatItem_Mask, Mask))
return false;
// Filter on relation
@@ -230,9 +220,7 @@ namespace SabreTools.Library.DatItems
return false;
// Filter on value
if (filter.DatItem_Value.MatchesPositiveSet(Value) == false)
return false;
if (filter.DatItem_Value.MatchesNegativeSet(Value) == true)
if (!PassStringFilter(filter.DatItem_Value, Value))
return false;
}