Make all DatItems handle being a sub item gracefully

SabreTools.Library/DatItems/Adjuster.cs

@@ -182,11 +182,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Analog.cs

@@ -92,31 +92,17 @@ namespace SabreTools.Library.DatItems
 
         #region Filtering
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on mask
             if (!filter.PassStringFilter(filter.DatItem_Analog_Mask, Mask))

SabreTools.Library/DatItems/Archive.cs

@@ -135,11 +135,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/BiosSet.cs

@@ -162,11 +162,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Chip.cs

@@ -180,11 +180,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Condition.cs

@@ -161,24 +161,18 @@ namespace SabreTools.Library.DatItems
 
         #region Filtering
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
+            // Check common fields first
+            if (!base.PassesFilter(filter, sub))
+                return false;
+
             if (sub)
             {
                 // Filter on tag
@@ -201,10 +195,6 @@ namespace SabreTools.Library.DatItems
             }
             else
             {
-                // Check common fields first
-                if (!base.PassesFilter(filter))
-                    return false;
-
                 // Filter on tag
                 if (!filter.PassStringFilter(filter.DatItem_Tag, Tag))
                     return false;

SabreTools.Library/DatItems/Configuration.cs

@@ -247,11 +247,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Control.cs

@@ -255,31 +255,17 @@ namespace SabreTools.Library.DatItems
 
         #region Filtering
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on control type
             if (filter.DatItem_Control_Type.MatchesPositive(ControlType.NULL, ControlType) == false)

SabreTools.Library/DatItems/DatItem.cs

@@ -721,16 +721,21 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public virtual bool PassesFilter(Filter filter)
+        public virtual bool PassesFilter(Filter filter, bool sub = false)
         {
             // Filter on machine fields
             if (!Machine.PassesFilter(filter))
                 return false;
 
+            // Filters for if we're a top-level item
+            if (!sub)
+            {
                 // Filter on item type
                 if (!filter.PassStringFilter(filter.DatItem_Type, ItemType.ToString()))
                     return false;
+            }
 
             return true;
         }

SabreTools.Library/DatItems/DataArea.cs

@@ -178,31 +178,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on area name
             if (!filter.PassStringFilter(filter.DatItem_AreaName, Name))

SabreTools.Library/DatItems/Device.cs

@@ -214,11 +214,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on device type

SabreTools.Library/DatItems/DeviceReference.cs

@@ -135,11 +135,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/DipSwitch.cs

@@ -294,11 +294,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             #region Common

SabreTools.Library/DatItems/Disk.cs

@@ -439,11 +439,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             #region Common

SabreTools.Library/DatItems/DiskArea.cs

@@ -133,31 +133,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on area name
             if (!filter.PassStringFilter(filter.DatItem_AreaName, Name))

SabreTools.Library/DatItems/Display.cs

@@ -298,11 +298,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on tag

SabreTools.Library/DatItems/Driver.cs

@@ -150,11 +150,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on status

SabreTools.Library/DatItems/Extension.cs

@@ -131,31 +131,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on item name
             if (!filter.PassStringFilter(filter.DatItem_Extension_Name, Name))

SabreTools.Library/DatItems/Feature.cs

@@ -132,11 +132,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on type

SabreTools.Library/DatItems/Info.cs

@@ -146,11 +146,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Input.cs

@@ -178,11 +178,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on service

SabreTools.Library/DatItems/Instance.cs

@@ -142,31 +142,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on item name
             if (!filter.PassStringFilter(filter.DatItem_Instance_Name, Name))

SabreTools.Library/DatItems/Location.cs

@@ -161,31 +161,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on item name
             if (!filter.PassStringFilter(filter.DatItem_Location_Name, Name))

SabreTools.Library/DatItems/Media.cs

@@ -336,11 +336,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Part.cs

@@ -169,31 +169,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on part name
             if (!filter.PassStringFilter(filter.DatItem_Part_Name, Name))

SabreTools.Library/DatItems/PartFeature.cs

@@ -142,31 +142,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on name
             if (!filter.PassStringFilter(filter.DatItem_Part_Feature_Name, Name))

SabreTools.Library/DatItems/Port.cs

@@ -128,11 +128,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on tag

SabreTools.Library/DatItems/RamOption.cs

@@ -160,11 +160,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Release.cs

@@ -190,11 +190,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Rom.cs

@@ -803,11 +803,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             #region Common

SabreTools.Library/DatItems/Sample.cs

@@ -135,11 +135,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Setting.cs

@@ -190,31 +190,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on item name
             if (!filter.PassStringFilter(filter.DatItem_Setting_Name, Name))

SabreTools.Library/DatItems/SharedFeature.cs

@@ -146,11 +146,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Slot.cs

@@ -167,11 +167,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/SlotOption.cs

@@ -158,31 +158,17 @@ namespace SabreTools.Library.DatItems
             }
         }
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="filter">Filter to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
-        {
-            return PassesFilter(filter, false);
-        }
-
         /// <summary>
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
         /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Filter filter, bool sub)
+        public override bool PassesFilter(Filter filter, bool sub = false)
-        {
-            // If we're a top-level item, check common fields
-            if (!sub)
         {
             // Check common fields first
-                if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
-            }
 
             // Filter on item name
             if (!filter.PassStringFilter(filter.DatItem_SlotOption_Name, Name))

SabreTools.Library/DatItems/SoftwareList.cs

@@ -164,11 +164,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on item name

SabreTools.Library/DatItems/Sound.cs

@@ -101,11 +101,12 @@ namespace SabreTools.Library.DatItems
         /// Check to see if a DatItem passes the filter
         /// </summary>
         /// <param name="filter">Filter to check against</param>
+        /// <param name="sub">True if this is a subitem, false otherwise</param>
         /// <returns>True if the item passed the filter, false otherwise</returns>
-        public override bool PassesFilter(Filter filter)
+        public override bool PassesFilter(Filter filter, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter))
+            if (!base.PassesFilter(filter, sub))
                 return false;
 
             // Filter on channels