From c54b35db92fe710faba5e92786f3e45b1b570ed0 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 2 Feb 2021 10:23:43 -0800 Subject: [PATCH] DatItem formats to own sub-namespace --- RombaSharp/Features/Archive.cs | 1 + RombaSharp/Features/BaseFeature.cs | 1 + RombaSharp/Features/RefreshDats.cs | 1 + RombaSharp/Features/RescanDepots.cs | 1 + SabreTools.DatFiles/DatFile.cs | 1 + SabreTools.DatFiles/Formats/AttractMode.cs | 1 + SabreTools.DatFiles/Formats/ClrMamePro.cs | 1 + SabreTools.DatFiles/Formats/DosCenter.cs | 1 + SabreTools.DatFiles/Formats/EverdriveSmdb.cs | 1 + SabreTools.DatFiles/Formats/Hashfile.cs | 1 + SabreTools.DatFiles/Formats/Listrom.cs | 1 + SabreTools.DatFiles/Formats/Listxml.cs | 5 +++-- SabreTools.DatFiles/Formats/Logiqx.cs | 1 + SabreTools.DatFiles/Formats/OfflineList.cs | 1 + SabreTools.DatFiles/Formats/OpenMSX.cs | 1 + SabreTools.DatFiles/Formats/RomCenter.cs | 1 + SabreTools.DatFiles/Formats/SabreJSON.cs | 3 ++- SabreTools.DatFiles/Formats/SeparatedValue.cs | 1 + SabreTools.DatFiles/Formats/SoftwareList.cs | 1 + SabreTools.DatFiles/ItemDictionary.cs | 1 + SabreTools.DatFiles/Setter.cs | 1 + SabreTools.DatItems/DatItem.cs | 1 + SabreTools.DatItems/{ => Formats}/Adjuster.cs | 2 +- SabreTools.DatItems/{ => Formats}/Analog.cs | 2 +- SabreTools.DatItems/{ => Formats}/Archive.cs | 2 +- SabreTools.DatItems/{ => Formats}/Auxiliary.cs | 2 +- SabreTools.DatItems/{ => Formats}/BiosSet.cs | 2 +- SabreTools.DatItems/{ => Formats}/Blank.cs | 2 +- SabreTools.DatItems/{ => Formats}/Chip.cs | 2 +- SabreTools.DatItems/{ => Formats}/Condition.cs | 2 +- SabreTools.DatItems/{ => Formats}/Configuration.cs | 2 +- SabreTools.DatItems/{ => Formats}/Control.cs | 2 +- SabreTools.DatItems/{ => Formats}/DataArea.cs | 2 +- SabreTools.DatItems/{ => Formats}/Device.cs | 2 +- SabreTools.DatItems/{ => Formats}/DeviceReference.cs | 2 +- SabreTools.DatItems/{ => Formats}/DipSwitch.cs | 2 +- SabreTools.DatItems/{ => Formats}/Disk.cs | 2 +- SabreTools.DatItems/{ => Formats}/DiskArea.cs | 2 +- SabreTools.DatItems/{ => Formats}/Display.cs | 2 +- SabreTools.DatItems/{ => Formats}/Driver.cs | 2 +- SabreTools.DatItems/{ => Formats}/Extension.cs | 2 +- SabreTools.DatItems/{ => Formats}/Feature.cs | 2 +- SabreTools.DatItems/{ => Formats}/Info.cs | 2 +- SabreTools.DatItems/{ => Formats}/Input.cs | 2 +- SabreTools.DatItems/{ => Formats}/Instance.cs | 2 +- SabreTools.DatItems/{ => Formats}/Location.cs | 2 +- SabreTools.DatItems/{ => Formats}/Media.cs | 2 +- SabreTools.DatItems/{ => Formats}/Part.cs | 2 +- SabreTools.DatItems/{ => Formats}/PartFeature.cs | 2 +- SabreTools.DatItems/{ => Formats}/Port.cs | 2 +- SabreTools.DatItems/{ => Formats}/RamOption.cs | 2 +- SabreTools.DatItems/{ => Formats}/Release.cs | 2 +- SabreTools.DatItems/{ => Formats}/Rom.cs | 2 +- SabreTools.DatItems/{ => Formats}/Sample.cs | 2 +- SabreTools.DatItems/{ => Formats}/Setting.cs | 2 +- SabreTools.DatItems/{ => Formats}/SharedFeature.cs | 2 +- SabreTools.DatItems/{ => Formats}/Slot.cs | 2 +- SabreTools.DatItems/{ => Formats}/SlotOption.cs | 2 +- SabreTools.DatItems/{ => Formats}/SoftwareList.cs | 2 +- SabreTools.DatItems/{ => Formats}/Sound.cs | 2 +- SabreTools.DatTools/DatFromDir.cs | 1 + SabreTools.DatTools/Rebuilder.cs | 1 + SabreTools.DatTools/Splitter.cs | 1 + SabreTools.DatTools/Verification.cs | 1 + SabreTools.Filtering/DatItemFilter.cs | 1 + SabreTools.Filtering/DatItemRemover.cs | 1 + SabreTools.Filtering/Replacer.cs | 1 + SabreTools.Filtering/Splitter.cs | 1 + SabreTools.Test/DatFiles/ItemDictionaryTests.cs | 1 + SabreTools.Test/DatFiles/SetterTests.cs | 1 + SabreTools.Test/DatItems/DatItemTests.cs | 1 + SabreTools.Test/FileTypes/BaseFileTests.cs | 2 +- SabreTools.Test/Filtering/CleaningTests.cs | 1 + SabreTools.Test/Filtering/FilteringTests.cs | 1 + SabreTools.Test/Filtering/RemoverTests.cs | 1 + SabreTools.Test/Filtering/ReplacerTests.cs | 1 + 76 files changed, 79 insertions(+), 42 deletions(-) rename SabreTools.DatItems/{ => Formats}/Adjuster.cs (98%) rename SabreTools.DatItems/{ => Formats}/Analog.cs (97%) rename SabreTools.DatItems/{ => Formats}/Archive.cs (98%) rename SabreTools.DatItems/{ => Formats}/Auxiliary.cs (93%) rename SabreTools.DatItems/{ => Formats}/BiosSet.cs (98%) rename SabreTools.DatItems/{ => Formats}/Blank.cs (97%) rename SabreTools.DatItems/{ => Formats}/Chip.cs (98%) rename SabreTools.DatItems/{ => Formats}/Condition.cs (98%) rename SabreTools.DatItems/{ => Formats}/Configuration.cs (99%) rename SabreTools.DatItems/{ => Formats}/Control.cs (99%) rename SabreTools.DatItems/{ => Formats}/DataArea.cs (98%) rename SabreTools.DatItems/{ => Formats}/Device.cs (99%) rename SabreTools.DatItems/{ => Formats}/DeviceReference.cs (98%) rename SabreTools.DatItems/{ => Formats}/DipSwitch.cs (99%) rename SabreTools.DatItems/{ => Formats}/Disk.cs (99%) rename SabreTools.DatItems/{ => Formats}/DiskArea.cs (98%) rename SabreTools.DatItems/{ => Formats}/Display.cs (99%) rename SabreTools.DatItems/{ => Formats}/Driver.cs (98%) rename SabreTools.DatItems/{ => Formats}/Extension.cs (98%) rename SabreTools.DatItems/{ => Formats}/Feature.cs (98%) rename SabreTools.DatItems/{ => Formats}/Info.cs (98%) rename SabreTools.DatItems/{ => Formats}/Input.cs (99%) rename SabreTools.DatItems/{ => Formats}/Instance.cs (98%) rename SabreTools.DatItems/{ => Formats}/Location.cs (98%) rename SabreTools.DatItems/{ => Formats}/Media.cs (99%) rename SabreTools.DatItems/{ => Formats}/Part.cs (98%) rename SabreTools.DatItems/{ => Formats}/PartFeature.cs (98%) rename SabreTools.DatItems/{ => Formats}/Port.cs (98%) rename SabreTools.DatItems/{ => Formats}/RamOption.cs (98%) rename SabreTools.DatItems/{ => Formats}/Release.cs (98%) rename SabreTools.DatItems/{ => Formats}/Rom.cs (99%) rename SabreTools.DatItems/{ => Formats}/Sample.cs (98%) rename SabreTools.DatItems/{ => Formats}/Setting.cs (98%) rename SabreTools.DatItems/{ => Formats}/SharedFeature.cs (98%) rename SabreTools.DatItems/{ => Formats}/Slot.cs (98%) rename SabreTools.DatItems/{ => Formats}/SlotOption.cs (98%) rename SabreTools.DatItems/{ => Formats}/SoftwareList.cs (98%) rename SabreTools.DatItems/{ => Formats}/Sound.cs (97%) diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs index 79f5be03..32739394 100644 --- a/RombaSharp/Features/Archive.cs +++ b/RombaSharp/Features/Archive.cs @@ -4,6 +4,7 @@ using System.Linq; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.DatTools; using SabreTools.FileTypes; using SabreTools.Help; diff --git a/RombaSharp/Features/BaseFeature.cs b/RombaSharp/Features/BaseFeature.cs index 8931f8fd..f9dd8196 100644 --- a/RombaSharp/Features/BaseFeature.cs +++ b/RombaSharp/Features/BaseFeature.cs @@ -9,6 +9,7 @@ using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.DatTools; using SabreTools.FileTypes; using SabreTools.Help; diff --git a/RombaSharp/Features/RefreshDats.cs b/RombaSharp/Features/RefreshDats.cs index 56e6fdd0..5b6e8111 100644 --- a/RombaSharp/Features/RefreshDats.cs +++ b/RombaSharp/Features/RefreshDats.cs @@ -3,6 +3,7 @@ using System.IO; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.DatTools; using SabreTools.FileTypes; using SabreTools.Help; diff --git a/RombaSharp/Features/RescanDepots.cs b/RombaSharp/Features/RescanDepots.cs index a0ef1632..454c59e3 100644 --- a/RombaSharp/Features/RescanDepots.cs +++ b/RombaSharp/Features/RescanDepots.cs @@ -3,6 +3,7 @@ using System.IO; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.DatTools; using SabreTools.FileTypes; using SabreTools.Help; diff --git a/SabreTools.DatFiles/DatFile.cs b/SabreTools.DatFiles/DatFile.cs index dd72c101..f4a552bd 100644 --- a/SabreTools.DatFiles/DatFile.cs +++ b/SabreTools.DatFiles/DatFile.cs @@ -8,6 +8,7 @@ using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatFiles.Formats; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Logging; using Newtonsoft.Json; diff --git a/SabreTools.DatFiles/Formats/AttractMode.cs b/SabreTools.DatFiles/Formats/AttractMode.cs index caaa2e65..cf4a837f 100644 --- a/SabreTools.DatFiles/Formats/AttractMode.cs +++ b/SabreTools.DatFiles/Formats/AttractMode.cs @@ -5,6 +5,7 @@ using System.Text; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/ClrMamePro.cs b/SabreTools.DatFiles/Formats/ClrMamePro.cs index 1bb0fe72..5f687daf 100644 --- a/SabreTools.DatFiles/Formats/ClrMamePro.cs +++ b/SabreTools.DatFiles/Formats/ClrMamePro.cs @@ -6,6 +6,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/DosCenter.cs b/SabreTools.DatFiles/Formats/DosCenter.cs index ae8c6d52..f3db8878 100644 --- a/SabreTools.DatFiles/Formats/DosCenter.cs +++ b/SabreTools.DatFiles/Formats/DosCenter.cs @@ -7,6 +7,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs index 78aac4ab..aa8bc597 100644 --- a/SabreTools.DatFiles/Formats/EverdriveSmdb.cs +++ b/SabreTools.DatFiles/Formats/EverdriveSmdb.cs @@ -5,6 +5,7 @@ using System.Text; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/Hashfile.cs b/SabreTools.DatFiles/Formats/Hashfile.cs index 39eafb47..65ae9dea 100644 --- a/SabreTools.DatFiles/Formats/Hashfile.cs +++ b/SabreTools.DatFiles/Formats/Hashfile.cs @@ -5,6 +5,7 @@ using System.Text; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/Listrom.cs b/SabreTools.DatFiles/Formats/Listrom.cs index 2eb35754..42d1d1b3 100644 --- a/SabreTools.DatFiles/Formats/Listrom.cs +++ b/SabreTools.DatFiles/Formats/Listrom.cs @@ -7,6 +7,7 @@ using System.Text.RegularExpressions; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; namespace SabreTools.DatFiles.Formats diff --git a/SabreTools.DatFiles/Formats/Listxml.cs b/SabreTools.DatFiles/Formats/Listxml.cs index 478361bd..0f0aff58 100644 --- a/SabreTools.DatFiles/Formats/Listxml.cs +++ b/SabreTools.DatFiles/Formats/Listxml.cs @@ -9,6 +9,7 @@ using System.Xml.Schema; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; namespace SabreTools.DatFiles.Formats @@ -716,7 +717,7 @@ namespace SabreTools.DatFiles.Formats break; case "softwarelist": - datItems.Add(new DatItems.SoftwareList + datItems.Add(new DatItems.Formats.SoftwareList { Name = reader.GetAttribute("name"), Status = reader.GetAttribute("status").AsSoftwareListStatus(), @@ -1836,7 +1837,7 @@ namespace SabreTools.DatFiles.Formats break; case ItemType.SoftwareList: - var softwareList = datItem as DatItems.SoftwareList; + var softwareList = datItem as DatItems.Formats.SoftwareList; xtw.WriteStartElement("softwarelist"); xtw.WriteRequiredAttributeString("name", softwareList.Name); xtw.WriteOptionalAttributeString("status", softwareList.Status.FromSoftwareListStatus()); diff --git a/SabreTools.DatFiles/Formats/Logiqx.cs b/SabreTools.DatFiles/Formats/Logiqx.cs index 1352cb77..2df989d4 100644 --- a/SabreTools.DatFiles/Formats/Logiqx.cs +++ b/SabreTools.DatFiles/Formats/Logiqx.cs @@ -10,6 +10,7 @@ using System.Xml.Schema; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; namespace SabreTools.DatFiles.Formats diff --git a/SabreTools.DatFiles/Formats/OfflineList.cs b/SabreTools.DatFiles/Formats/OfflineList.cs index 0aa2e640..57e6f450 100644 --- a/SabreTools.DatFiles/Formats/OfflineList.cs +++ b/SabreTools.DatFiles/Formats/OfflineList.cs @@ -8,6 +8,7 @@ using System.Xml.Schema; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; namespace SabreTools.DatFiles.Formats diff --git a/SabreTools.DatFiles/Formats/OpenMSX.cs b/SabreTools.DatFiles/Formats/OpenMSX.cs index 5f89d278..1acee36a 100644 --- a/SabreTools.DatFiles/Formats/OpenMSX.cs +++ b/SabreTools.DatFiles/Formats/OpenMSX.cs @@ -8,6 +8,7 @@ using System.Xml.Schema; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; namespace SabreTools.DatFiles.Formats diff --git a/SabreTools.DatFiles/Formats/RomCenter.cs b/SabreTools.DatFiles/Formats/RomCenter.cs index 8f903663..da2534b7 100644 --- a/SabreTools.DatFiles/Formats/RomCenter.cs +++ b/SabreTools.DatFiles/Formats/RomCenter.cs @@ -6,6 +6,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/SabreJSON.cs b/SabreTools.DatFiles/Formats/SabreJSON.cs index 651f06a8..39033fc9 100644 --- a/SabreTools.DatFiles/Formats/SabreJSON.cs +++ b/SabreTools.DatFiles/Formats/SabreJSON.cs @@ -7,6 +7,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; @@ -314,7 +315,7 @@ namespace SabreTools.DatFiles.Formats datItem = datItemObj.ToObject(); break; case ItemType.SoftwareList: - datItem = datItemObj.ToObject(); + datItem = datItemObj.ToObject(); break; case ItemType.Sound: datItem = datItemObj.ToObject(); diff --git a/SabreTools.DatFiles/Formats/SeparatedValue.cs b/SabreTools.DatFiles/Formats/SeparatedValue.cs index c3557c8c..b5c93eab 100644 --- a/SabreTools.DatFiles/Formats/SeparatedValue.cs +++ b/SabreTools.DatFiles/Formats/SeparatedValue.cs @@ -6,6 +6,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.IO.Readers; using SabreTools.IO.Writers; diff --git a/SabreTools.DatFiles/Formats/SoftwareList.cs b/SabreTools.DatFiles/Formats/SoftwareList.cs index 5d6154af..9ef0ffbb 100644 --- a/SabreTools.DatFiles/Formats/SoftwareList.cs +++ b/SabreTools.DatFiles/Formats/SoftwareList.cs @@ -9,6 +9,7 @@ using System.Xml.Schema; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; // TODO: Use softwarelist.dtd and *try* to make this write more correctly diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs index dabbd720..dcba995c 100644 --- a/SabreTools.DatFiles/ItemDictionary.cs +++ b/SabreTools.DatFiles/ItemDictionary.cs @@ -7,6 +7,7 @@ using System.Xml.Serialization; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Logging; using NaturalSort; using Newtonsoft.Json; diff --git a/SabreTools.DatFiles/Setter.cs b/SabreTools.DatFiles/Setter.cs index 31ecc8d8..05972f16 100644 --- a/SabreTools.DatFiles/Setter.cs +++ b/SabreTools.DatFiles/Setter.cs @@ -5,6 +5,7 @@ using System.Linq; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Logging; namespace SabreTools.DatFiles diff --git a/SabreTools.DatItems/DatItem.cs b/SabreTools.DatItems/DatItem.cs index d11bf452..a875e791 100644 --- a/SabreTools.DatItems/DatItem.cs +++ b/SabreTools.DatItems/DatItem.cs @@ -6,6 +6,7 @@ using System.Xml.Serialization; using SabreTools.Core; using SabreTools.Core.Tools; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using SabreTools.Logging; using NaturalSort; diff --git a/SabreTools.DatItems/Adjuster.cs b/SabreTools.DatItems/Formats/Adjuster.cs similarity index 98% rename from SabreTools.DatItems/Adjuster.cs rename to SabreTools.DatItems/Formats/Adjuster.cs index 57efa942..65f9ec2a 100644 --- a/SabreTools.DatItems/Adjuster.cs +++ b/SabreTools.DatItems/Formats/Adjuster.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which Adjuster(s) is associated with a set diff --git a/SabreTools.DatItems/Analog.cs b/SabreTools.DatItems/Formats/Analog.cs similarity index 97% rename from SabreTools.DatItems/Analog.cs rename to SabreTools.DatItems/Formats/Analog.cs index d2347725..d477b792 100644 --- a/SabreTools.DatItems/Analog.cs +++ b/SabreTools.DatItems/Formats/Analog.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a single analog item diff --git a/SabreTools.DatItems/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs similarity index 98% rename from SabreTools.DatItems/Archive.cs rename to SabreTools.DatItems/Formats/Archive.cs index 7ecce037..325409ef 100644 --- a/SabreTools.DatItems/Archive.cs +++ b/SabreTools.DatItems/Formats/Archive.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents generic archive files to be included in a set diff --git a/SabreTools.DatItems/Auxiliary.cs b/SabreTools.DatItems/Formats/Auxiliary.cs similarity index 93% rename from SabreTools.DatItems/Auxiliary.cs rename to SabreTools.DatItems/Formats/Auxiliary.cs index 36a2d37c..362c0a30 100644 --- a/SabreTools.DatItems/Auxiliary.cs +++ b/SabreTools.DatItems/Formats/Auxiliary.cs @@ -5,7 +5,7 @@ using Newtonsoft.Json; /// /// This holds all of the auxiliary types needed for proper parsing /// -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { #region DatItem diff --git a/SabreTools.DatItems/BiosSet.cs b/SabreTools.DatItems/Formats/BiosSet.cs similarity index 98% rename from SabreTools.DatItems/BiosSet.cs rename to SabreTools.DatItems/Formats/BiosSet.cs index ff3af616..ad874e65 100644 --- a/SabreTools.DatItems/BiosSet.cs +++ b/SabreTools.DatItems/Formats/BiosSet.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which BIOS(es) is associated with a set diff --git a/SabreTools.DatItems/Blank.cs b/SabreTools.DatItems/Formats/Blank.cs similarity index 97% rename from SabreTools.DatItems/Blank.cs rename to SabreTools.DatItems/Formats/Blank.cs index 4aecdc51..dfbded24 100644 --- a/SabreTools.DatItems/Blank.cs +++ b/SabreTools.DatItems/Formats/Blank.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a blank set from an input DAT diff --git a/SabreTools.DatItems/Chip.cs b/SabreTools.DatItems/Formats/Chip.cs similarity index 98% rename from SabreTools.DatItems/Chip.cs rename to SabreTools.DatItems/Formats/Chip.cs index 573b73cf..9f31cc53 100644 --- a/SabreTools.DatItems/Chip.cs +++ b/SabreTools.DatItems/Formats/Chip.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which Chip(s) is associated with a set diff --git a/SabreTools.DatItems/Condition.cs b/SabreTools.DatItems/Formats/Condition.cs similarity index 98% rename from SabreTools.DatItems/Condition.cs rename to SabreTools.DatItems/Formats/Condition.cs index f465e3ee..09cac61e 100644 --- a/SabreTools.DatItems/Condition.cs +++ b/SabreTools.DatItems/Formats/Condition.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a condition on a machine or other item diff --git a/SabreTools.DatItems/Configuration.cs b/SabreTools.DatItems/Formats/Configuration.cs similarity index 99% rename from SabreTools.DatItems/Configuration.cs rename to SabreTools.DatItems/Formats/Configuration.cs index c77851dc..41c40ea6 100644 --- a/SabreTools.DatItems/Configuration.cs +++ b/SabreTools.DatItems/Formats/Configuration.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which Configuration(s) is associated with a set diff --git a/SabreTools.DatItems/Control.cs b/SabreTools.DatItems/Formats/Control.cs similarity index 99% rename from SabreTools.DatItems/Control.cs rename to SabreTools.DatItems/Formats/Control.cs index 617a21e8..c65a4ee3 100644 --- a/SabreTools.DatItems/Control.cs +++ b/SabreTools.DatItems/Formats/Control.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents control for an input diff --git a/SabreTools.DatItems/DataArea.cs b/SabreTools.DatItems/Formats/DataArea.cs similarity index 98% rename from SabreTools.DatItems/DataArea.cs rename to SabreTools.DatItems/Formats/DataArea.cs index bd88f6a3..59a0e201 100644 --- a/SabreTools.DatItems/DataArea.cs +++ b/SabreTools.DatItems/Formats/DataArea.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// SoftwareList dataarea information diff --git a/SabreTools.DatItems/Device.cs b/SabreTools.DatItems/Formats/Device.cs similarity index 99% rename from SabreTools.DatItems/Device.cs rename to SabreTools.DatItems/Formats/Device.cs index 82e4f728..4ccf0130 100644 --- a/SabreTools.DatItems/Device.cs +++ b/SabreTools.DatItems/Formats/Device.cs @@ -5,7 +5,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a single device on the machine diff --git a/SabreTools.DatItems/DeviceReference.cs b/SabreTools.DatItems/Formats/DeviceReference.cs similarity index 98% rename from SabreTools.DatItems/DeviceReference.cs rename to SabreTools.DatItems/Formats/DeviceReference.cs index 3606d924..5350ed92 100644 --- a/SabreTools.DatItems/DeviceReference.cs +++ b/SabreTools.DatItems/Formats/DeviceReference.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which Device Reference(s) is associated with a set diff --git a/SabreTools.DatItems/DipSwitch.cs b/SabreTools.DatItems/Formats/DipSwitch.cs similarity index 99% rename from SabreTools.DatItems/DipSwitch.cs rename to SabreTools.DatItems/Formats/DipSwitch.cs index 7a816dc2..1baf9e3b 100644 --- a/SabreTools.DatItems/DipSwitch.cs +++ b/SabreTools.DatItems/Formats/DipSwitch.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which DIP Switch(es) is associated with a set diff --git a/SabreTools.DatItems/Disk.cs b/SabreTools.DatItems/Formats/Disk.cs similarity index 99% rename from SabreTools.DatItems/Disk.cs rename to SabreTools.DatItems/Formats/Disk.cs index 34d3f1bd..c5c6e2ef 100644 --- a/SabreTools.DatItems/Disk.cs +++ b/SabreTools.DatItems/Formats/Disk.cs @@ -6,7 +6,7 @@ using SabreTools.FileTypes; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents Compressed Hunks of Data (CHD) formatted disks which use internal hashes diff --git a/SabreTools.DatItems/DiskArea.cs b/SabreTools.DatItems/Formats/DiskArea.cs similarity index 98% rename from SabreTools.DatItems/DiskArea.cs rename to SabreTools.DatItems/Formats/DiskArea.cs index 3c07ece8..3f0de88d 100644 --- a/SabreTools.DatItems/DiskArea.cs +++ b/SabreTools.DatItems/Formats/DiskArea.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// SoftwareList diskarea information diff --git a/SabreTools.DatItems/Display.cs b/SabreTools.DatItems/Formats/Display.cs similarity index 99% rename from SabreTools.DatItems/Display.cs rename to SabreTools.DatItems/Formats/Display.cs index 78945cfc..fa698bd4 100644 --- a/SabreTools.DatItems/Display.cs +++ b/SabreTools.DatItems/Formats/Display.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one machine display diff --git a/SabreTools.DatItems/Driver.cs b/SabreTools.DatItems/Formats/Driver.cs similarity index 98% rename from SabreTools.DatItems/Driver.cs rename to SabreTools.DatItems/Formats/Driver.cs index 1588258e..b27f183c 100644 --- a/SabreTools.DatItems/Driver.cs +++ b/SabreTools.DatItems/Formats/Driver.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents the a driver of the machine diff --git a/SabreTools.DatItems/Extension.cs b/SabreTools.DatItems/Formats/Extension.cs similarity index 98% rename from SabreTools.DatItems/Extension.cs rename to SabreTools.DatItems/Formats/Extension.cs index 09b29b6b..eaf68e12 100644 --- a/SabreTools.DatItems/Extension.cs +++ b/SabreTools.DatItems/Formats/Extension.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a matchable extension diff --git a/SabreTools.DatItems/Feature.cs b/SabreTools.DatItems/Formats/Feature.cs similarity index 98% rename from SabreTools.DatItems/Feature.cs rename to SabreTools.DatItems/Formats/Feature.cs index 4184b7ae..5d62577e 100644 --- a/SabreTools.DatItems/Feature.cs +++ b/SabreTools.DatItems/Formats/Feature.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents the a feature of the machine diff --git a/SabreTools.DatItems/Info.cs b/SabreTools.DatItems/Formats/Info.cs similarity index 98% rename from SabreTools.DatItems/Info.cs rename to SabreTools.DatItems/Formats/Info.cs index d30ab650..b0a72147 100644 --- a/SabreTools.DatItems/Info.cs +++ b/SabreTools.DatItems/Formats/Info.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents special information about a machine diff --git a/SabreTools.DatItems/Input.cs b/SabreTools.DatItems/Formats/Input.cs similarity index 99% rename from SabreTools.DatItems/Input.cs rename to SabreTools.DatItems/Formats/Input.cs index 456b7986..eeb104aa 100644 --- a/SabreTools.DatItems/Input.cs +++ b/SabreTools.DatItems/Formats/Input.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one ListXML input diff --git a/SabreTools.DatItems/Instance.cs b/SabreTools.DatItems/Formats/Instance.cs similarity index 98% rename from SabreTools.DatItems/Instance.cs rename to SabreTools.DatItems/Formats/Instance.cs index 994d81a5..bebde36f 100644 --- a/SabreTools.DatItems/Instance.cs +++ b/SabreTools.DatItems/Formats/Instance.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a single instance of another item diff --git a/SabreTools.DatItems/Location.cs b/SabreTools.DatItems/Formats/Location.cs similarity index 98% rename from SabreTools.DatItems/Location.cs rename to SabreTools.DatItems/Formats/Location.cs index b7c609dc..bae4ad03 100644 --- a/SabreTools.DatItems/Location.cs +++ b/SabreTools.DatItems/Formats/Location.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one conflocation or diplocation diff --git a/SabreTools.DatItems/Media.cs b/SabreTools.DatItems/Formats/Media.cs similarity index 99% rename from SabreTools.DatItems/Media.cs rename to SabreTools.DatItems/Formats/Media.cs index 63784be0..f9bd0ca1 100644 --- a/SabreTools.DatItems/Media.cs +++ b/SabreTools.DatItems/Formats/Media.cs @@ -6,7 +6,7 @@ using SabreTools.Core.Tools; using SabreTools.FileTypes; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents Aaruformat images which use internal hashes diff --git a/SabreTools.DatItems/Part.cs b/SabreTools.DatItems/Formats/Part.cs similarity index 98% rename from SabreTools.DatItems/Part.cs rename to SabreTools.DatItems/Formats/Part.cs index fcb083ad..9adef25e 100644 --- a/SabreTools.DatItems/Part.cs +++ b/SabreTools.DatItems/Formats/Part.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// SoftwareList part information diff --git a/SabreTools.DatItems/PartFeature.cs b/SabreTools.DatItems/Formats/PartFeature.cs similarity index 98% rename from SabreTools.DatItems/PartFeature.cs rename to SabreTools.DatItems/Formats/PartFeature.cs index 56423e9b..4f6c59ef 100644 --- a/SabreTools.DatItems/PartFeature.cs +++ b/SabreTools.DatItems/Formats/PartFeature.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one part feature object diff --git a/SabreTools.DatItems/Port.cs b/SabreTools.DatItems/Formats/Port.cs similarity index 98% rename from SabreTools.DatItems/Port.cs rename to SabreTools.DatItems/Formats/Port.cs index 2266336f..04182beb 100644 --- a/SabreTools.DatItems/Port.cs +++ b/SabreTools.DatItems/Formats/Port.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a single port on a machine diff --git a/SabreTools.DatItems/RamOption.cs b/SabreTools.DatItems/Formats/RamOption.cs similarity index 98% rename from SabreTools.DatItems/RamOption.cs rename to SabreTools.DatItems/Formats/RamOption.cs index b0c264d2..5ebeb830 100644 --- a/SabreTools.DatItems/RamOption.cs +++ b/SabreTools.DatItems/Formats/RamOption.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which RAM option(s) is associated with a set diff --git a/SabreTools.DatItems/Release.cs b/SabreTools.DatItems/Formats/Release.cs similarity index 98% rename from SabreTools.DatItems/Release.cs rename to SabreTools.DatItems/Formats/Release.cs index 876a9f37..3f8c1201 100644 --- a/SabreTools.DatItems/Release.cs +++ b/SabreTools.DatItems/Formats/Release.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents release information about a set diff --git a/SabreTools.DatItems/Rom.cs b/SabreTools.DatItems/Formats/Rom.cs similarity index 99% rename from SabreTools.DatItems/Rom.cs rename to SabreTools.DatItems/Formats/Rom.cs index 60f6cda1..fc0fe64c 100644 --- a/SabreTools.DatItems/Rom.cs +++ b/SabreTools.DatItems/Formats/Rom.cs @@ -9,7 +9,7 @@ using SabreTools.FileTypes; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a generic file within a set diff --git a/SabreTools.DatItems/Sample.cs b/SabreTools.DatItems/Formats/Sample.cs similarity index 98% rename from SabreTools.DatItems/Sample.cs rename to SabreTools.DatItems/Formats/Sample.cs index 44cbac77..f67e959c 100644 --- a/SabreTools.DatItems/Sample.cs +++ b/SabreTools.DatItems/Formats/Sample.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents a (usually WAV-formatted) sample to be included for use in the set diff --git a/SabreTools.DatItems/Setting.cs b/SabreTools.DatItems/Formats/Setting.cs similarity index 98% rename from SabreTools.DatItems/Setting.cs rename to SabreTools.DatItems/Formats/Setting.cs index 203104e2..d243607b 100644 --- a/SabreTools.DatItems/Setting.cs +++ b/SabreTools.DatItems/Formats/Setting.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one ListXML confsetting or dipvalue diff --git a/SabreTools.DatItems/SharedFeature.cs b/SabreTools.DatItems/Formats/SharedFeature.cs similarity index 98% rename from SabreTools.DatItems/SharedFeature.cs rename to SabreTools.DatItems/Formats/SharedFeature.cs index cbb4cb93..7dc969ca 100644 --- a/SabreTools.DatItems/SharedFeature.cs +++ b/SabreTools.DatItems/Formats/SharedFeature.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one shared feature object diff --git a/SabreTools.DatItems/Slot.cs b/SabreTools.DatItems/Formats/Slot.cs similarity index 98% rename from SabreTools.DatItems/Slot.cs rename to SabreTools.DatItems/Formats/Slot.cs index 315c44fc..fbf28d8c 100644 --- a/SabreTools.DatItems/Slot.cs +++ b/SabreTools.DatItems/Formats/Slot.cs @@ -4,7 +4,7 @@ using System.Xml.Serialization; using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which Slot(s) is associated with a set diff --git a/SabreTools.DatItems/SlotOption.cs b/SabreTools.DatItems/Formats/SlotOption.cs similarity index 98% rename from SabreTools.DatItems/SlotOption.cs rename to SabreTools.DatItems/Formats/SlotOption.cs index 81a73f60..a9e32fb1 100644 --- a/SabreTools.DatItems/SlotOption.cs +++ b/SabreTools.DatItems/Formats/SlotOption.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents one ListXML slotoption diff --git a/SabreTools.DatItems/SoftwareList.cs b/SabreTools.DatItems/Formats/SoftwareList.cs similarity index 98% rename from SabreTools.DatItems/SoftwareList.cs rename to SabreTools.DatItems/Formats/SoftwareList.cs index 9bd9104d..704f38dc 100644 --- a/SabreTools.DatItems/SoftwareList.cs +++ b/SabreTools.DatItems/Formats/SoftwareList.cs @@ -4,7 +4,7 @@ using SabreTools.Core; using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents which SoftwareList(s) is associated with a set diff --git a/SabreTools.DatItems/Sound.cs b/SabreTools.DatItems/Formats/Sound.cs similarity index 97% rename from SabreTools.DatItems/Sound.cs rename to SabreTools.DatItems/Formats/Sound.cs index 98fbf7cd..53c46522 100644 --- a/SabreTools.DatItems/Sound.cs +++ b/SabreTools.DatItems/Formats/Sound.cs @@ -3,7 +3,7 @@ using SabreTools.Core; using Newtonsoft.Json; -namespace SabreTools.DatItems +namespace SabreTools.DatItems.Formats { /// /// Represents the sound output for a machine diff --git a/SabreTools.DatTools/DatFromDir.cs b/SabreTools.DatTools/DatFromDir.cs index de1cbe32..da130eda 100644 --- a/SabreTools.DatTools/DatFromDir.cs +++ b/SabreTools.DatTools/DatFromDir.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using SabreTools.Core; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using SabreTools.FileTypes.Archives; using SabreTools.IO; diff --git a/SabreTools.DatTools/Rebuilder.cs b/SabreTools.DatTools/Rebuilder.cs index 6b025ac0..dc915707 100644 --- a/SabreTools.DatTools/Rebuilder.cs +++ b/SabreTools.DatTools/Rebuilder.cs @@ -7,6 +7,7 @@ using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using SabreTools.FileTypes.Archives; using SabreTools.IO; diff --git a/SabreTools.DatTools/Splitter.cs b/SabreTools.DatTools/Splitter.cs index 033a3e1d..27ce0a2c 100644 --- a/SabreTools.DatTools/Splitter.cs +++ b/SabreTools.DatTools/Splitter.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using SabreTools.Core; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.IO; using SabreTools.Logging; using NaturalSort; diff --git a/SabreTools.DatTools/Verification.cs b/SabreTools.DatTools/Verification.cs index c8bc8579..4d79320b 100644 --- a/SabreTools.DatTools/Verification.cs +++ b/SabreTools.DatTools/Verification.cs @@ -6,6 +6,7 @@ using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using SabreTools.FileTypes.Archives; using SabreTools.Logging; diff --git a/SabreTools.Filtering/DatItemFilter.cs b/SabreTools.Filtering/DatItemFilter.cs index db2793e6..7560b78b 100644 --- a/SabreTools.Filtering/DatItemFilter.cs +++ b/SabreTools.Filtering/DatItemFilter.cs @@ -3,6 +3,7 @@ using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Logging; namespace SabreTools.Filtering diff --git a/SabreTools.Filtering/DatItemRemover.cs b/SabreTools.Filtering/DatItemRemover.cs index fce711c7..99debe93 100644 --- a/SabreTools.Filtering/DatItemRemover.cs +++ b/SabreTools.Filtering/DatItemRemover.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using SabreTools.Core; using SabreTools.Core.Tools; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; namespace SabreTools.Filtering { diff --git a/SabreTools.Filtering/Replacer.cs b/SabreTools.Filtering/Replacer.cs index d16a1364..595f6f3f 100644 --- a/SabreTools.Filtering/Replacer.cs +++ b/SabreTools.Filtering/Replacer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; namespace SabreTools.Filtering { diff --git a/SabreTools.Filtering/Splitter.cs b/SabreTools.Filtering/Splitter.cs index c5cecbf6..7283af7b 100644 --- a/SabreTools.Filtering/Splitter.cs +++ b/SabreTools.Filtering/Splitter.cs @@ -5,6 +5,7 @@ using System.Linq; using SabreTools.Core; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Logging; namespace SabreTools.Filtering diff --git a/SabreTools.Test/DatFiles/ItemDictionaryTests.cs b/SabreTools.Test/DatFiles/ItemDictionaryTests.cs index 4bb629f7..07416332 100644 --- a/SabreTools.Test/DatFiles/ItemDictionaryTests.cs +++ b/SabreTools.Test/DatFiles/ItemDictionaryTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using Xunit; namespace SabreTools.Test.DatFiles diff --git a/SabreTools.Test/DatFiles/SetterTests.cs b/SabreTools.Test/DatFiles/SetterTests.cs index 80751ce3..62355376 100644 --- a/SabreTools.Test/DatFiles/SetterTests.cs +++ b/SabreTools.Test/DatFiles/SetterTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using SabreTools.Core; using SabreTools.DatFiles; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using Xunit; namespace SabreTools.Test.DatFiles diff --git a/SabreTools.Test/DatItems/DatItemTests.cs b/SabreTools.Test/DatItems/DatItemTests.cs index d8d276e6..8903ca1c 100644 --- a/SabreTools.Test/DatItems/DatItemTests.cs +++ b/SabreTools.Test/DatItems/DatItemTests.cs @@ -1,5 +1,6 @@ using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using SabreTools.FileTypes.Aaru; using SabreTools.FileTypes.Archives; diff --git a/SabreTools.Test/FileTypes/BaseFileTests.cs b/SabreTools.Test/FileTypes/BaseFileTests.cs index 1b025446..481f8f9d 100644 --- a/SabreTools.Test/FileTypes/BaseFileTests.cs +++ b/SabreTools.Test/FileTypes/BaseFileTests.cs @@ -4,7 +4,7 @@ using System.Text; using SabreTools.Core; using SabreTools.Core.Tools; -using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.FileTypes; using Xunit; diff --git a/SabreTools.Test/Filtering/CleaningTests.cs b/SabreTools.Test/Filtering/CleaningTests.cs index ebf0fae3..02801c9a 100644 --- a/SabreTools.Test/Filtering/CleaningTests.cs +++ b/SabreTools.Test/Filtering/CleaningTests.cs @@ -1,4 +1,5 @@ using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Filtering; using Xunit; diff --git a/SabreTools.Test/Filtering/FilteringTests.cs b/SabreTools.Test/Filtering/FilteringTests.cs index e348348f..357a3d73 100644 --- a/SabreTools.Test/Filtering/FilteringTests.cs +++ b/SabreTools.Test/Filtering/FilteringTests.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Filtering; using Xunit; diff --git a/SabreTools.Test/Filtering/RemoverTests.cs b/SabreTools.Test/Filtering/RemoverTests.cs index f42c71ad..dff5f423 100644 --- a/SabreTools.Test/Filtering/RemoverTests.cs +++ b/SabreTools.Test/Filtering/RemoverTests.cs @@ -1,4 +1,5 @@ using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Filtering; using Xunit; diff --git a/SabreTools.Test/Filtering/ReplacerTests.cs b/SabreTools.Test/Filtering/ReplacerTests.cs index 09ebf25e..33aec135 100644 --- a/SabreTools.Test/Filtering/ReplacerTests.cs +++ b/SabreTools.Test/Filtering/ReplacerTests.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using SabreTools.Core; using SabreTools.DatItems; +using SabreTools.DatItems.Formats; using SabreTools.Filtering; using Xunit;