From 5d855ef60beab707b8c31224b8f887c23b0cec32 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 12 Jul 2017 14:40:10 -0500 Subject: [PATCH] more attribute renaming --- BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs | 4 ++-- BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs | 4 ++-- .../tools/VirtualPads/schema/A26Schema.cs | 2 +- .../tools/VirtualPads/schema/A7800HawkSchema.cs | 2 +- .../tools/VirtualPads/schema/A78Schema.cs | 2 +- .../tools/VirtualPads/schema/AppleIISchema.cs | 2 +- .../tools/VirtualPads/schema/C64Schema.cs | 2 +- .../tools/VirtualPads/schema/ColecoSchema.cs | 2 +- .../tools/VirtualPads/schema/DualGBSchema.cs | 2 +- .../tools/VirtualPads/schema/GBASchema.cs | 2 +- BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs | 2 +- .../tools/VirtualPads/schema/GenSchema.cs | 2 +- .../tools/VirtualPads/schema/IntvSchema.cs | 2 +- .../tools/VirtualPads/schema/LynxSchema.cs | 2 +- .../tools/VirtualPads/schema/N64Schema.cs | 2 +- .../tools/VirtualPads/schema/NesSchema.cs | 2 +- .../tools/VirtualPads/schema/NgpSchema.cs | 2 +- .../tools/VirtualPads/schema/PSXSchema.cs | 2 +- .../tools/VirtualPads/schema/PceSchema.cs | 4 ++-- .../tools/VirtualPads/schema/SatSchema.cs | 2 +- .../tools/VirtualPads/schema/SchemaAttributes.cs | 4 ++-- .../tools/VirtualPads/schema/SmsSchema.cs | 2 +- .../tools/VirtualPads/schema/SnesSchema.cs | 2 +- .../tools/VirtualPads/schema/VirtualBoySchema.cs | 2 +- .../tools/VirtualPads/schema/WonderSwanSchema.cs | 2 +- BizHawk.Emulation.Common/Extensions.cs | 4 ++-- BizHawk.Emulation.Common/ServiceAttributes.cs | 6 +++--- 27 files changed, 34 insertions(+), 34 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs index 9a9574b704..2787e74bf9 100644 --- a/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs +++ b/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs @@ -37,8 +37,8 @@ namespace BizHawk.Client.EmuHawk Services.Add(si.TypeName, si); } - var notapplicableAttr = ((ServiceNotApplicable)Attribute - .GetCustomAttribute(emu.GetType(), typeof(ServiceNotApplicable))); + var notapplicableAttr = ((ServiceNotApplicableAttribute)Attribute + .GetCustomAttribute(emu.GetType(), typeof(ServiceNotApplicableAttribute))); if (notapplicableAttr != null) { diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index 809b5cfcde..80f2952046 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -84,10 +84,10 @@ namespace BizHawk.Client.EmuHawk .GetTypes() .Where(t => typeof(IVirtualPadSchema) .IsAssignableFrom(t) && t.GetCustomAttributes(false) - .OfType() + .OfType() .Any()) .FirstOrDefault(t => t.GetCustomAttributes(false) - .OfType() + .OfType() .First().SystemId == Emulator.SystemId); if (schemaType != null) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs index 59890aa8a3..6369a8a1b5 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A26Schema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Atari.Atari2600; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("A26")] + [Schema("A26")] public class A26Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A7800HawkSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A7800HawkSchema.cs index 1c4fa60977..6e2545f634 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A7800HawkSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A7800HawkSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Atari.A7800Hawk; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("A7800Hawk")] + [Schema("A7800Hawk")] public class A7800HawkSchema : IVirtualPadSchema { private string UnpluggedControllerName => typeof(UnpluggedController).DisplayName(); diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs index a1f51ede4f..f7cf8bdc34 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Atari.Atari7800; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("A78")] + [Schema("A78")] public class A78Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs index fff1dbfddd..b723d0d589 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/AppleIISchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("AppleII")] + [Schema("AppleII")] public class AppleIISchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs index d59962d548..db6cb551d3 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/C64Schema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("C64")] + [Schema("C64")] public class C64Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs index 1ad314d76d..79dcea2db2 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ColecoSchema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.ColecoVision; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("Coleco")] + [Schema("Coleco")] public class ColecoSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs index d7acfc41e1..445edd5419 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/DualGBSchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("DGB")] + [Schema("DGB")] public class DualGBSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs index 119f022536..493f1b649e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBASchema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Nintendo.GBA; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("GBA")] + [Schema("GBA")] public class GBASchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs index 2044d5a493..69a909cca6 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GBSchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("GB")] + [Schema("GB")] public class GBSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs index 8805d794e0..ff964a6048 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/GenSchema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Consoles.Sega.gpgx; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("GEN")] + [Schema("GEN")] public class GenSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs index 1b5f42b4e0..1ebad3d4de 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/IntvSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Intellivision; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("INTV")] + [Schema("INTV")] public class IntvSchema : IVirtualPadSchema { private string UnpluggedControllerName => typeof(UnpluggedController).DisplayName(); diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs index 72859eaa2e..6137fac22c 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/LynxSchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("Lynx")] + [Schema("Lynx")] public class LynxSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs index 925849abcf..5d66220a90 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/N64Schema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Nintendo.N64; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("N64")] + [Schema("N64")] public class N64Schema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs index 83b95d1bdc..c8032fc0e4 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NesSchema.cs @@ -9,7 +9,7 @@ using BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("NES")] + [Schema("NES")] public class NesSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs index 667ef6a28c..046f400ed2 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/NgpSchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("NGP")] + [Schema("NGP")] public class NgpSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs index e307438784..8277cf0d5a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PSXSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Sony.PSX; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("PSX")] + [Schema("PSX")] public class PSXSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs index b0ed56f313..5b5f6d26f5 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/PceSchema.cs @@ -5,10 +5,10 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("PCECD")] + [Schema("PCECD")] public class PceCdSchema : PceSchema { } - [SchemaAttributes("PCE")] + [Schema("PCE")] public class PceSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs index 25e4099dfc..f777728e40 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SatSchema.cs @@ -8,7 +8,7 @@ using BizHawk.Emulation.Cores.Consoles.Sega.Saturn; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("SAT")] + [Schema("SAT")] public class SaturnSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttributes.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttributes.cs index feb84f29fe..5cba133178 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttributes.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SchemaAttributes.cs @@ -3,14 +3,14 @@ namespace BizHawk.Client.EmuHawk { [AttributeUsage(AttributeTargets.Class)] - public class SchemaAttributes : Attribute + public class SchemaAttribute : Attribute { /// /// Gets the system id associated with this schema /// public string SystemId { get; private set; } - public SchemaAttributes(string systemId) + public SchemaAttribute(string systemId) { SystemId = systemId; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs index 50d3718077..209c7bd806 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SmsSchema.cs @@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Sega.MasterSystem; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("SMS")] + [Schema("SMS")] public class SmsSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs index 696466e938..db530a30c8 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SnesSchema.cs @@ -7,7 +7,7 @@ using BizHawk.Emulation.Cores.Nintendo.SNES9X; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("SNES")] + [Schema("SNES")] public class SnesSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs index e731e61e52..b56819b21a 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/VirtualBoySchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("VB")] + [Schema("VB")] public class VirtualBoySchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs index c9c563ed8a..3497fdf045 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/schema/WonderSwanSchema.cs @@ -5,7 +5,7 @@ using BizHawk.Emulation.Common; namespace BizHawk.Client.EmuHawk { - [SchemaAttributes("WSWAN")] + [Schema("WSWAN")] public class WonderSwanSchema : IVirtualPadSchema { public IEnumerable GetPadSchemas(IEmulator core) diff --git a/BizHawk.Emulation.Common/Extensions.cs b/BizHawk.Emulation.Common/Extensions.cs index 89691e4668..75e9a5d69b 100644 --- a/BizHawk.Emulation.Common/Extensions.cs +++ b/BizHawk.Emulation.Common/Extensions.cs @@ -371,7 +371,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions public static bool IsImplemented(this MethodInfo info) { // If a method is marked as Not implemented, it is not implemented no matter what the body is - if (info.GetCustomAttributes(false).Any(a => a is FeatureNotImplemented)) + if (info.GetCustomAttributes(false).Any(a => a is FeatureNotImplementedAttribute)) { return false; } @@ -388,7 +388,7 @@ namespace BizHawk.Emulation.Common.IEmulatorExtensions public static bool IsImplemented(this PropertyInfo info) { - return !info.GetCustomAttributes(false).Any(a => a is FeatureNotImplemented); + return !info.GetCustomAttributes(false).Any(a => a is FeatureNotImplementedAttribute); } } } \ No newline at end of file diff --git a/BizHawk.Emulation.Common/ServiceAttributes.cs b/BizHawk.Emulation.Common/ServiceAttributes.cs index f41e4c9fea..9d5fc2db9a 100644 --- a/BizHawk.Emulation.Common/ServiceAttributes.cs +++ b/BizHawk.Emulation.Common/ServiceAttributes.cs @@ -9,7 +9,7 @@ namespace BizHawk.Emulation.Common /// By Convention it should also throw a NotImplementedException /// Any feature that does not have this attribute is assumed to be implemented /// - public class FeatureNotImplemented : Attribute + public class FeatureNotImplementedAttribute : Attribute { } @@ -21,9 +21,9 @@ namespace BizHawk.Emulation.Common /// assumed to be a "TODO" that needs to be done but hasn't been done yet /// [AttributeUsage(AttributeTargets.Class)] - public class ServiceNotApplicable : Attribute + public class ServiceNotApplicableAttribute : Attribute { - public ServiceNotApplicable(params Type[] types) + public ServiceNotApplicableAttribute(params Type[] types) { NotApplicableTypes = types?.ToList() ?? new List(); }