Fix build... (understatement)

SabreTools.DatItems/DipSwitch.cs

@@ -107,33 +107,32 @@ namespace SabreTools.DatItems
             return Name;
         }
 
-        /// <summary>
-        /// Set fields with given values
-        /// </summary>
-        /// <param name="mappings">Mappings dictionary</param>
-        public override void SetFields(Dictionary<Field, string> mappings)
+        /// <inheritdoc/>
+        public override void SetFields(
+            Dictionary<DatItemField, string> datItemMappings,
+            Dictionary<MachineField, string> machineMappings)
         {
             // Set base fields
-            base.SetFields(mappings);
+            base.SetFields(datItemMappings, machineMappings);
 
             // Handle DipSwitch-specific fields
 
             #region Common
 
-            if (mappings.Keys.Contains(Field.DatItem_Name))
-                Name = mappings[Field.DatItem_Name];
+            if (datItemMappings.Keys.Contains(DatItemField.Name))
+                Name = datItemMappings[DatItemField.Name];
 
-            if (mappings.Keys.Contains(Field.DatItem_Tag))
-                Tag = mappings[Field.DatItem_Tag];
+            if (datItemMappings.Keys.Contains(DatItemField.Tag))
+                Tag = datItemMappings[DatItemField.Tag];
 
-            if (mappings.Keys.Contains(Field.DatItem_Mask))
-                Mask = mappings[Field.DatItem_Mask];
+            if (datItemMappings.Keys.Contains(DatItemField.Mask))
+                Mask = datItemMappings[DatItemField.Mask];
 
             if (ConditionsSpecified)
             {
                 foreach (Condition condition in Conditions)
                 {
-                    condition.SetFields(mappings, true);
+                    condition.SetFields(datItemMappings, machineMappings, true);
                 }
             }
 
@@ -141,7 +140,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Location location in Locations)
                 {
-                    location.SetFields(mappings);
+                    location.SetFields(datItemMappings, machineMappings);
                 }
             }
 
@@ -149,7 +148,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Setting value in Values)
                 {
-                    value.SetFields(mappings);
+                    value.SetFields(datItemMappings, machineMappings);
                 }
             }
 
@@ -161,7 +160,7 @@ namespace SabreTools.DatItems
             if (Part == null)
                 Part = new Part();
 
-            Part.SetFields(mappings);
+            Part.SetFields(datItemMappings, machineMappings);
 
             #endregion
         }
@@ -290,30 +289,25 @@ namespace SabreTools.DatItems
             }
         }
 
-        /// <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 override bool PassesFilter(Filter filter, bool sub = false)
+        /// <inheritdoc/>
+        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
         {
             // Check common fields first
-            if (!base.PassesFilter(filter, sub))
+            if (!base.PassesFilter(cleaner, sub))
                 return false;
 
             #region Common
 
             // Filter on item name
-            if (!filter.PassStringFilter(filter.DatItem_Name, Name))
+            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
                 return false;
 
             // Filter on tag
-            if (!filter.PassStringFilter(filter.DatItem_Tag, Tag))
+            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
                 return false;
 
             // Filter on mask
-            if (!filter.PassStringFilter(filter.DatItem_Mask, Mask))
+            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Mask, Mask))
                 return false;
 
             // Filter on individual conditions
@@ -321,7 +315,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Condition condition in Conditions)
                 {
-                    if (!condition.PassesFilter(filter, true))
+                    if (!condition.PassesFilter(cleaner, true))
                         return false;
                 }
             }
@@ -331,7 +325,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Location location in Locations)
                 {
-                    if (!location.PassesFilter(filter, true))
+                    if (!location.PassesFilter(cleaner, true))
                         return false;
                 }
             }
@@ -341,7 +335,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Setting value in Values)
                 {
-                    if (!value.PassesFilter(filter, true))
+                    if (!value.PassesFilter(cleaner, true))
                         return false;
                 }
             }
@@ -353,7 +347,7 @@ namespace SabreTools.DatItems
             // Filter on Part
             if (PartSpecified)
             {
-                if (!Part.PassesFilter(filter, true))
+                if (!Part.PassesFilter(cleaner, true))
                     return false;
             }
 
@@ -362,33 +356,32 @@ namespace SabreTools.DatItems
             return true;
         }
 
-        /// <summary>
-        /// Remove fields from the DatItem
-        /// </summary>
-        /// <param name="fields">List of Fields to remove</param>
-        public override void RemoveFields(List<Field> fields)
+        /// <inheritdoc/>
+        public override void RemoveFields(
+            List<DatItemField> datItemFields,
+            List<MachineField> machineFields)
         {
             // Remove common fields first
-            base.RemoveFields(fields);
+            base.RemoveFields(datItemFields, machineFields);
 
             // Remove the fields
 
             #region Common
 
-            if (fields.Contains(Field.DatItem_Name))
+            if (datItemFields.Contains(DatItemField.Name))
                 Name = null;
 
-            if (fields.Contains(Field.DatItem_Tag))
+            if (datItemFields.Contains(DatItemField.Tag))
                 Tag = null;
 
-            if (fields.Contains(Field.DatItem_Mask))
+            if (datItemFields.Contains(DatItemField.Mask))
                 Mask = null;
 
             if (ConditionsSpecified)
             {
                 foreach (Condition condition in Conditions)
                 {
-                    condition.RemoveFields(fields, true);
+                    condition.RemoveFields(datItemFields, machineFields, true);
                 }
             }
 
@@ -396,7 +389,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Location location in Locations)
                 {
-                    location.RemoveFields(fields);
+                    location.RemoveFields(datItemFields, machineFields);
                 }
             }
 
@@ -404,7 +397,7 @@ namespace SabreTools.DatItems
             {
                 foreach (Setting value in Values)
                 {
-                    value.RemoveFields(fields);
+                    value.RemoveFields(datItemFields, machineFields);
                 }
             }
 
@@ -413,7 +406,7 @@ namespace SabreTools.DatItems
             #region SoftwareList
 
             if (PartSpecified)
-                Part.RemoveFields(fields);
+                Part.RemoveFields(datItemFields, machineFields);
 
             #endregion
         }
@@ -432,15 +425,14 @@ namespace SabreTools.DatItems
 
         #region Sorting and Merging
 
-        /// <summary>
-        /// Replace fields from another item
-        /// </summary>
-        /// <param name="item">DatItem to pull new information from</param>
-        /// <param name="fields">List of Fields representing what should be updated</param>
-        public override void ReplaceFields(DatItem item, List<Field> fields)
+        /// <inheritdoc/>
+        public override void ReplaceFields(
+            DatItem item,
+            List<DatItemField> datItemFields,
+            List<MachineField> machineFields)
         {
             // Replace common fields first
-            base.ReplaceFields(item, fields);
+            base.ReplaceFields(item, datItemFields, machineFields);
 
             // If we don't have a DipSwitch to replace from, ignore specific fields
             if (item.ItemType != ItemType.DipSwitch)
@@ -453,13 +445,13 @@ namespace SabreTools.DatItems
 
             #region Common
 
-            if (fields.Contains(Field.DatItem_Name))
+            if (datItemFields.Contains(DatItemField.Name))
                 Name = newItem.Name;
 
-            if (fields.Contains(Field.DatItem_Tag))
+            if (datItemFields.Contains(DatItemField.Tag))
                 Tag = newItem.Tag;
 
-            if (fields.Contains(Field.DatItem_Mask))
+            if (datItemFields.Contains(DatItemField.Mask))
                 Mask = newItem.Mask;
 
             // DatItem_Condition_* doesn't make sense here
@@ -479,7 +471,7 @@ namespace SabreTools.DatItems
             #region SoftwareList
 
             if (PartSpecified && newItem.PartSpecified)
-                Part.ReplaceFields(newItem.Part, fields);
+                Part.ReplaceFields(newItem.Part, datItemFields, machineFields);
 
             #endregion
         }