diff --git a/SabreTools.Printing/AACSMediaKeyBlock.cs b/SabreTools.Printing/AACSMediaKeyBlock.cs index db18861..609457d 100644 --- a/SabreTools.Printing/AACSMediaKeyBlock.cs +++ b/SabreTools.Printing/AACSMediaKeyBlock.cs @@ -3,7 +3,7 @@ using SabreTools.Models.AACS; namespace SabreTools.Printing { - public static class AACSMediaKeyBlock + public class AACSMediaKeyBlock : IPrinter { public static void Print(StringBuilder builder, MediaKeyBlock mediaKeyBlock) { diff --git a/SabreTools.Printing/BDPlusSVM.cs b/SabreTools.Printing/BDPlusSVM.cs index 1a09c03..79bed4c 100644 --- a/SabreTools.Printing/BDPlusSVM.cs +++ b/SabreTools.Printing/BDPlusSVM.cs @@ -3,7 +3,7 @@ using SabreTools.Models.BDPlus; namespace SabreTools.Printing { - public static class BDPlusSVM + public class BDPlusSVM : IPrinter { public static void Print(StringBuilder builder, SVM svm) { diff --git a/SabreTools.Printing/BFPK.cs b/SabreTools.Printing/BFPK.cs index 338f732..9637533 100644 --- a/SabreTools.Printing/BFPK.cs +++ b/SabreTools.Printing/BFPK.cs @@ -3,7 +3,7 @@ using SabreTools.Models.BFPK; namespace SabreTools.Printing { - public static class BFPK + public class BFPK : IPrinter { public static void Print(StringBuilder builder, Archive archive) { diff --git a/SabreTools.Printing/BSP.cs b/SabreTools.Printing/BSP.cs index 2df650f..05e3aaf 100644 --- a/SabreTools.Printing/BSP.cs +++ b/SabreTools.Printing/BSP.cs @@ -4,7 +4,7 @@ using static SabreTools.Models.BSP.Constants; namespace SabreTools.Printing { - public static class BSP + public class BSP : IPrinter { public static void Print(StringBuilder builder, File file) { @@ -141,6 +141,5 @@ namespace SabreTools.Printing } builder.AppendLine(); } - } } \ No newline at end of file diff --git a/SabreTools.Printing/CFB.cs b/SabreTools.Printing/CFB.cs index 2de4d93..d4dd5fa 100644 --- a/SabreTools.Printing/CFB.cs +++ b/SabreTools.Printing/CFB.cs @@ -4,7 +4,7 @@ using SabreTools.Models.CFB; namespace SabreTools.Printing { - public static class CFB + public class CFB : IPrinter { public static void Print(StringBuilder builder, Binary binary) { @@ -116,6 +116,5 @@ namespace SabreTools.Printing } builder.AppendLine(); } - } } \ No newline at end of file diff --git a/SabreTools.Printing/CIA.cs b/SabreTools.Printing/CIA.cs index f9487ee..adbb805 100644 --- a/SabreTools.Printing/CIA.cs +++ b/SabreTools.Printing/CIA.cs @@ -3,9 +3,9 @@ using SabreTools.Models.N3DS; namespace SabreTools.Printing { - public static class CIA + public class CIA : IPrinter { - public static void Print(StringBuilder builder, SabreTools.Models.N3DS.CIA cia) + public static void Print(StringBuilder builder, Models.N3DS.CIA cia) { builder.AppendLine("CIA Archive Information:"); builder.AppendLine("-------------------------"); diff --git a/SabreTools.Printing/GCF.cs b/SabreTools.Printing/GCF.cs index 8d3b171..c766100 100644 --- a/SabreTools.Printing/GCF.cs +++ b/SabreTools.Printing/GCF.cs @@ -3,7 +3,7 @@ using SabreTools.Models.GCF; namespace SabreTools.Printing { - public static class GCF + public class GCF : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/IPrinter.cs b/SabreTools.Printing/IPrinter.cs new file mode 100644 index 0000000..1805416 --- /dev/null +++ b/SabreTools.Printing/IPrinter.cs @@ -0,0 +1,11 @@ +namespace SabreTools.Printing +{ + /// + /// Marks a class as a printer associated with a model + /// + /// Type of the top-level model + public interface IPrinter + { + // Empty interface to associate a model with a printer + } +} \ No newline at end of file diff --git a/SabreTools.Printing/IRD.cs b/SabreTools.Printing/IRD.cs index 93d811b..4ce9836 100644 --- a/SabreTools.Printing/IRD.cs +++ b/SabreTools.Printing/IRD.cs @@ -2,7 +2,7 @@ using System.Text; namespace SabreTools.Printing { - public static class IRD + public class IRD : IPrinter { public static void Print(StringBuilder builder, Models.IRD.File ird) { diff --git a/SabreTools.Printing/InstallShieldCabinet.cs b/SabreTools.Printing/InstallShieldCabinet.cs index e63ce93..b2264ff 100644 --- a/SabreTools.Printing/InstallShieldCabinet.cs +++ b/SabreTools.Printing/InstallShieldCabinet.cs @@ -1,11 +1,10 @@ -using System; using System.Collections.Generic; using System.Text; using SabreTools.Models.InstallShieldCabinet; namespace SabreTools.Printing { - public static class InstallShieldCabinet + public class InstallShieldCabinet : IPrinter { public static void Print(StringBuilder builder, Cabinet cabinet) { diff --git a/SabreTools.Printing/LinearExecutable.cs b/SabreTools.Printing/LinearExecutable.cs index dfddc11..9750672 100644 --- a/SabreTools.Printing/LinearExecutable.cs +++ b/SabreTools.Printing/LinearExecutable.cs @@ -1,10 +1,9 @@ using System.Text; using SabreTools.Models.LinearExecutable; -using SabreTools.Models.MicrosoftCabinet; namespace SabreTools.Printing { - public static class LinearExecutable + public class LinearExecutable : IPrinter { public static void Print(StringBuilder builder, Executable executable) { @@ -37,7 +36,7 @@ namespace SabreTools.Printing Print(builder, executable.DebugInformation); } - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) + private static void Print(StringBuilder builder, Models.MSDOS.ExecutableHeader? header) { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); diff --git a/SabreTools.Printing/MSDOS.cs b/SabreTools.Printing/MSDOS.cs index ac7fc03..6068811 100644 --- a/SabreTools.Printing/MSDOS.cs +++ b/SabreTools.Printing/MSDOS.cs @@ -3,7 +3,7 @@ using SabreTools.Models.MSDOS; namespace SabreTools.Printing { - public static class MSDOS + public class MSDOS : IPrinter { public static void Print(StringBuilder builder, Executable executable) { diff --git a/SabreTools.Printing/MicrosoftCabinet.cs b/SabreTools.Printing/MicrosoftCabinet.cs index fcb6ae2..7e07bf9 100644 --- a/SabreTools.Printing/MicrosoftCabinet.cs +++ b/SabreTools.Printing/MicrosoftCabinet.cs @@ -1,10 +1,9 @@ -using System; using System.Text; using SabreTools.Models.MicrosoftCabinet; namespace SabreTools.Printing { - public static class MicrosoftCabinet + public class MicrosoftCabinet : IPrinter { public static void Print(StringBuilder builder, Cabinet cabinet) { diff --git a/SabreTools.Printing/N3DS.cs b/SabreTools.Printing/N3DS.cs index 72d1e4a..6753cc6 100644 --- a/SabreTools.Printing/N3DS.cs +++ b/SabreTools.Printing/N3DS.cs @@ -3,7 +3,7 @@ using SabreTools.Models.N3DS; namespace SabreTools.Printing { - public static class N3DS + public class N3DS : IPrinter { public static void Print(StringBuilder builder, Cart cart) { diff --git a/SabreTools.Printing/NCF.cs b/SabreTools.Printing/NCF.cs index 7247cc3..31c9e8a 100644 --- a/SabreTools.Printing/NCF.cs +++ b/SabreTools.Printing/NCF.cs @@ -3,7 +3,7 @@ using SabreTools.Models.NCF; namespace SabreTools.Printing { - public static class NCF + public class NCF : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/NewExecutable.cs b/SabreTools.Printing/NewExecutable.cs index 9d3a3c8..c7caaf5 100644 --- a/SabreTools.Printing/NewExecutable.cs +++ b/SabreTools.Printing/NewExecutable.cs @@ -5,7 +5,7 @@ using static SabreTools.Serialization.Extensions; namespace SabreTools.Printing { - public static class NewExecutable + public class NewExecutable : IPrinter { public static void Print(StringBuilder builder, Executable executable) { @@ -29,7 +29,7 @@ namespace SabreTools.Printing Print(builder, executable.NonResidentNameTable); } - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) + private static void Print(StringBuilder builder, Models.MSDOS.ExecutableHeader? header) { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); @@ -250,7 +250,7 @@ namespace SabreTools.Printing builder.AppendLine(); } - private static void Print(StringBuilder builder, ModuleReferenceTableEntry?[]? entries, SabreTools.Models.MSDOS.ExecutableHeader? stub, ExecutableHeader? header) + private static void Print(StringBuilder builder, ModuleReferenceTableEntry?[]? entries, Models.MSDOS.ExecutableHeader? stub, ExecutableHeader? header) { builder.AppendLine(" Module-Reference Table Information:"); builder.AppendLine(" -------------------------"); diff --git a/SabreTools.Printing/Nitro.cs b/SabreTools.Printing/Nitro.cs index a130d56..dfc1f53 100644 --- a/SabreTools.Printing/Nitro.cs +++ b/SabreTools.Printing/Nitro.cs @@ -3,7 +3,7 @@ using SabreTools.Models.Nitro; namespace SabreTools.Printing { - public static class Nitro + public class Nitro : IPrinter { public static void Print(StringBuilder builder, Cart cart) { diff --git a/SabreTools.Printing/PAK.cs b/SabreTools.Printing/PAK.cs index 0a53c8f..babf7cb 100644 --- a/SabreTools.Printing/PAK.cs +++ b/SabreTools.Printing/PAK.cs @@ -3,7 +3,7 @@ using SabreTools.Models.PAK; namespace SabreTools.Printing { - public static class PAK + public class PAK : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/PFF.cs b/SabreTools.Printing/PFF.cs index 7e61e8c..e9ccf23 100644 --- a/SabreTools.Printing/PFF.cs +++ b/SabreTools.Printing/PFF.cs @@ -3,7 +3,7 @@ using SabreTools.Models.PFF; namespace SabreTools.Printing { - public static class PFF + public class PFF : IPrinter { public static void Print(StringBuilder builder, Archive archive) { diff --git a/SabreTools.Printing/PlayJAudioFile.cs b/SabreTools.Printing/PlayJAudioFile.cs index d841c12..4dcc1eb 100644 --- a/SabreTools.Printing/PlayJAudioFile.cs +++ b/SabreTools.Printing/PlayJAudioFile.cs @@ -3,7 +3,7 @@ using SabreTools.Models.PlayJ; namespace SabreTools.Printing { - public static class PlayJAudioFile + public class PlayJAudioFile : IPrinter { public static void Print(StringBuilder builder, AudioFile audio) { diff --git a/SabreTools.Printing/PortableExecutable.cs b/SabreTools.Printing/PortableExecutable.cs index 84bbfda..139cf74 100644 --- a/SabreTools.Printing/PortableExecutable.cs +++ b/SabreTools.Printing/PortableExecutable.cs @@ -10,7 +10,7 @@ using static SabreTools.Serialization.Extensions; namespace SabreTools.Printing { - public static class PortableExecutable + public class PortableExecutable : IPrinter { public static void Print(StringBuilder builder, Executable executable) { @@ -40,7 +40,7 @@ namespace SabreTools.Printing Print(builder, executable.ResourceDirectoryTable); } - private static void Print(StringBuilder builder, SabreTools.Models.MSDOS.ExecutableHeader? header) + private static void Print(StringBuilder builder, Models.MSDOS.ExecutableHeader? header) { builder.AppendLine(" MS-DOS Stub Header Information:"); builder.AppendLine(" -------------------------"); diff --git a/SabreTools.Printing/Quantum.cs b/SabreTools.Printing/Quantum.cs index dcb72e3..3922b2f 100644 --- a/SabreTools.Printing/Quantum.cs +++ b/SabreTools.Printing/Quantum.cs @@ -3,7 +3,7 @@ using SabreTools.Models.Quantum; namespace SabreTools.Printing { - public static class Quantum + public class Quantum : IPrinter { public static void Print(StringBuilder builder, Archive archive) { diff --git a/SabreTools.Printing/SGA.cs b/SabreTools.Printing/SGA.cs index 8ac883f..165f685 100644 --- a/SabreTools.Printing/SGA.cs +++ b/SabreTools.Printing/SGA.cs @@ -3,7 +3,7 @@ using SabreTools.Models.SGA; namespace SabreTools.Printing { - public static class SGA + public class SGA : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/VBSP.cs b/SabreTools.Printing/VBSP.cs index 011f500..a8926cc 100644 --- a/SabreTools.Printing/VBSP.cs +++ b/SabreTools.Printing/VBSP.cs @@ -4,7 +4,7 @@ using static SabreTools.Models.VBSP.Constants; namespace SabreTools.Printing { - public static class VBSP + public class VBSP : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/VPK.cs b/SabreTools.Printing/VPK.cs index 81320df..4c0faaa 100644 --- a/SabreTools.Printing/VPK.cs +++ b/SabreTools.Printing/VPK.cs @@ -3,7 +3,7 @@ using SabreTools.Models.VPK; namespace SabreTools.Printing { - public static class VPK + public class VPK : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/WAD.cs b/SabreTools.Printing/WAD.cs index e87b866..cc65a13 100644 --- a/SabreTools.Printing/WAD.cs +++ b/SabreTools.Printing/WAD.cs @@ -3,7 +3,7 @@ using SabreTools.Models.WAD; namespace SabreTools.Printing { - public static class WAD + public class WAD : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/XMID.cs b/SabreTools.Printing/XMID.cs index 0c1dc10..9d3022a 100644 --- a/SabreTools.Printing/XMID.cs +++ b/SabreTools.Printing/XMID.cs @@ -3,7 +3,7 @@ using static SabreTools.Models.Xbox.Constants; namespace SabreTools.Printing { - public static class XMID + public class XMID : IPrinter { public static void Print(StringBuilder builder, Models.Xbox.XMID xmid) { diff --git a/SabreTools.Printing/XZP.cs b/SabreTools.Printing/XZP.cs index f416016..5bfc396 100644 --- a/SabreTools.Printing/XZP.cs +++ b/SabreTools.Printing/XZP.cs @@ -3,7 +3,7 @@ using SabreTools.Models.XZP; namespace SabreTools.Printing { - public static class XZP + public class XZP : IPrinter { public static void Print(StringBuilder builder, File file) { diff --git a/SabreTools.Printing/XeMID.cs b/SabreTools.Printing/XeMID.cs index 09cfc88..5eece3a 100644 --- a/SabreTools.Printing/XeMID.cs +++ b/SabreTools.Printing/XeMID.cs @@ -3,7 +3,7 @@ using static SabreTools.Models.Xbox.Constants; namespace SabreTools.Printing { - public static class XeMID + public class XeMID : IPrinter { public static void Print(StringBuilder builder, Models.Xbox.XeMID xemid) {