Plugins - Implemented features

Core - Removed Stylet dependency for #500

src/Artemis.Core/Plugins/LayerBrushes/Internal/BaseLayerBrush.cs

@@ -1,17 +1,15 @@
 using System;
-using Artemis.Core.Services;
 using SkiaSharp;
-using Stylet;
 
 namespace Artemis.Core.LayerBrushes
 {
     /// <summary>
     ///     For internal use only, please use <see cref="LayerBrush{T}" /> or <see cref="RgbNetLayerBrush{T}" /> or instead
     /// </summary>
-    public abstract class BaseLayerBrush : PropertyChangedBase, IDisposable
+    public abstract class BaseLayerBrush : CorePropertyChanged, IDisposable
     {
         private LayerBrushType _brushType;
-        private LayerBrushConfigurationDialog _configurationDialog;
+        private ILayerBrushConfigurationDialog _configurationDialog;
         private LayerBrushDescriptor _descriptor;
         private Layer _layer;
         private bool _supportsTransformation = true;
@@ -37,7 +35,7 @@ namespace Artemis.Core.LayerBrushes
         /// <summary>
         ///     Gets or sets a configuration dialog complementing the regular properties
         /// </summary>
-        public LayerBrushConfigurationDialog ConfigurationDialog
+        public ILayerBrushConfigurationDialog ConfigurationDialog
         {
             get => _configurationDialog;
             protected set => SetAndNotify(ref _configurationDialog, value);
@@ -53,9 +51,9 @@ namespace Artemis.Core.LayerBrushes
         }
 
         /// <summary>
-        ///     Gets the plugin info that defined this brush
+        ///     Gets the ID of the <see cref="LayerBrushProvider" /> that provided this effect
         /// </summary>
-        public PluginInfo PluginInfo => Descriptor.LayerBrushProvider.PluginInfo;
+        public string ProviderId => Descriptor?.Provider?.Id;
 
         /// <summary>
         ///     Gets a reference to the layer property group without knowing it's type
@@ -72,21 +70,11 @@ namespace Artemis.Core.LayerBrushes
             protected set
             {
                 if (value && BrushType == LayerBrushType.RgbNet)
-                    throw new ArtemisPluginException(PluginInfo, "An RGB.NET brush cannot support transformation");
+                    throw new ArtemisPluginFeatureException(Descriptor.Provider, "An RGB.NET brush cannot support transformation");
                 _supportsTransformation = value;
             }
         }
 
-        /// <inheritdoc />
-        public void Dispose()
-        {
-            DisableLayerBrush();
-            BaseProperties.Dispose();
-
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
         /// <summary>
         ///     Called when the layer brush is activated
         /// </summary>
@@ -112,6 +100,16 @@ namespace Artemis.Core.LayerBrushes
         internal virtual void Dispose(bool disposing)
         {
         }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            DisableLayerBrush();
+            BaseProperties.Dispose();
+
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
     }
 
     /// <summary>

src/Artemis.Core/Plugins/LayerBrushes/Internal/PropertiesLayerBrush.cs

@@ -37,7 +37,7 @@ namespace Artemis.Core.LayerBrushes
             Properties = Activator.CreateInstance<T>();
             Properties.GroupDescription ??= new PropertyGroupDescriptionAttribute {Name = Descriptor.DisplayName, Description = Descriptor.Description};
             Properties.LayerBrush = this;
-            Properties.Initialize(Layer, "LayerBrush.", PluginInfo);
+            Properties.Initialize(Layer, "LayerBrush.", Descriptor.Provider);
             PropertiesInitialized = true;
 
             EnableLayerBrush();