From 4bb72c63b23435505601da8ad89992a3441035b1 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 16 Jul 2024 10:14:45 +0200 Subject: [PATCH] correct constructor parameter names for plugin features --- Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs | 1 - Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs | 4 ++-- Pilz.Plugins.Advanced.UI/PluginModule.cs | 6 +++--- Pilz.Plugins.Advanced.UI/PluginModule{T}.cs | 4 ++-- Pilz.Plugins.Advanced/PluginFeature.cs | 8 ++++---- Pilz.Plugins.Advanced/PluginFunction.cs | 4 ++-- Pilz.Plugins.Advanced/PluginModuleBase.cs | 4 ++-- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs b/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs index 8476354..1a58383 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs +++ b/Pilz.Plugins.Advanced.UI.Telerik/Extensions.cs @@ -1,6 +1,5 @@ using Telerik.WinControls; using Telerik.WinControls.UI; -using static System.Runtime.InteropServices.JavaScript.JSType; namespace Pilz.Plugins.Advanced.UI.Telerik; diff --git a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs b/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs index ff03678..3a51b58 100644 --- a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs +++ b/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModule.cs @@ -15,12 +15,12 @@ public abstract class RadPluginModule : PluginModule set => base.Icon = value; } - protected RadPluginModule(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier) + protected RadPluginModule(string type, string identifier) : base(type, identifier) { } - protected RadPluginModule(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName) + protected RadPluginModule(string type, string identifier, string? name) : base(type, identifier, name) { } diff --git a/Pilz.Plugins.Advanced.UI/PluginModule.cs b/Pilz.Plugins.Advanced.UI/PluginModule.cs index 746e3bd..b098af2 100644 --- a/Pilz.Plugins.Advanced.UI/PluginModule.cs +++ b/Pilz.Plugins.Advanced.UI/PluginModule.cs @@ -5,12 +5,12 @@ namespace Pilz.Plugins.Advanced.UI; public abstract class PluginModule : PluginModule { - protected PluginModule(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier) + protected PluginModule(string type, string identifier) : base(type, identifier) { } - protected PluginModule(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName) + protected PluginModule(string type, string identifier, string? name) : base(type, identifier, name) { } @@ -19,7 +19,7 @@ public abstract class PluginModule : PluginModule if (CreateNewUI(@params) is PluginModuleUI ui) { ui.BackColor = Color.Transparent; - DialogBase.Show(ui, Name!, Image!.ToIcon()); + DialogBase.Show(ui, Name!, Image!.ToIcon()!); } } } diff --git a/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs b/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs index 8803979..d20b17d 100644 --- a/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs +++ b/Pilz.Plugins.Advanced.UI/PluginModule{T}.cs @@ -14,11 +14,11 @@ public abstract class PluginModule : PluginModuleBase where TPl set => base.Icon = value; } - protected PluginModule(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier) + protected PluginModule(string type, string identifier) : base(type, identifier) { } - protected PluginModule(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName) + protected PluginModule(string type, string identifier, string? name) : base(type, identifier, name) { } diff --git a/Pilz.Plugins.Advanced/PluginFeature.cs b/Pilz.Plugins.Advanced/PluginFeature.cs index 21fa9c2..a3b7975 100644 --- a/Pilz.Plugins.Advanced/PluginFeature.cs +++ b/Pilz.Plugins.Advanced/PluginFeature.cs @@ -45,15 +45,15 @@ public abstract class PluginFeature /// public virtual bool Enabled { get; set; } = true; - protected PluginFeature(string featureType, string identifier) + protected PluginFeature(string type, string identifier) { Identifier = identifier; - Type = featureType; + Type = type; } - protected PluginFeature(string featureType, string featureIdentifier, string? featureName) : this(featureType, featureIdentifier) + protected PluginFeature(string type, string identifier, string? name) : this(type, identifier) { - Name = featureName; + Name = name; } public static string GetFullIdentifier(string featureType, string identifier) diff --git a/Pilz.Plugins.Advanced/PluginFunction.cs b/Pilz.Plugins.Advanced/PluginFunction.cs index 6d7c5a5..0d77a98 100644 --- a/Pilz.Plugins.Advanced/PluginFunction.cs +++ b/Pilz.Plugins.Advanced/PluginFunction.cs @@ -2,11 +2,11 @@ public abstract class PluginFunction : PluginFeature { - protected PluginFunction(string functionType, string functionIdentifier) : base(functionType, functionIdentifier) + protected PluginFunction(string type, string identifier) : base(type, identifier) { } - protected PluginFunction(string functionType, string functionIdentifier, string? functionName) : base(functionType, functionIdentifier, functionName) + protected PluginFunction(string type, string identifier, string? name) : base(type, identifier, name) { } diff --git a/Pilz.Plugins.Advanced/PluginModuleBase.cs b/Pilz.Plugins.Advanced/PluginModuleBase.cs index d2e7d47..ff8343c 100644 --- a/Pilz.Plugins.Advanced/PluginModuleBase.cs +++ b/Pilz.Plugins.Advanced/PluginModuleBase.cs @@ -5,11 +5,11 @@ namespace Pilz.Plugins.Advanced; [EditorBrowsable(EditorBrowsableState.Never)] public abstract class PluginModuleBase : PluginFeature { - protected PluginModuleBase(string moduleType, string moduleIdentifier) : base(moduleType, moduleIdentifier) + protected PluginModuleBase(string type, string identifier) : base(type, identifier) { } - protected PluginModuleBase(string moduleType, string moduleIdentifier, string moduleName) : base(moduleType, moduleIdentifier, moduleName) + protected PluginModuleBase(string type, string identifier, string? name) : base(type, identifier, name) { } } \ No newline at end of file