From 19e83d5043632e4ef823f8728b20bcf77211783b Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Thu, 18 Jan 2024 22:40:55 +0000
Subject: [PATCH] cleanup

---
 .../PrimaryWidgetConfigurationHandler.cs          |  8 --------
 .../WidgetComponentViewModelFactory.cs            | 14 --------------
 .../WidgetComponentViewModelProvider.cs           | 15 +++++++++++++++
 Hyperbar/Lifecycles/IFactory.cs                   | 12 ------------
 Hyperbar/Lifecycles/IProvider.cs                  | 11 +++++++++++
 5 files changed, 26 insertions(+), 34 deletions(-)
 create mode 100644 Hyperbar.Windows.Primary/WidgetComponentViewModelProvider.cs
 create mode 100644 Hyperbar/Lifecycles/IProvider.cs

diff --git a/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs b/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
index 5601de7..d2584b2 100644
--- a/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
+++ b/Hyperbar.Windows.Primary/PrimaryWidgetConfigurationHandler.cs
@@ -59,13 +59,5 @@ public class PrimaryWidgetConfigurationHandler(IMediator mediator,
                 }
             }
         }
-
-        //foreach (KeyValuePair<Guid, IWidgetComponentViewModel> item in cache
-        //    .Where(x => !items.Any(k => x.Key == k.Id)))
-        //{
-        //    await mediator.PublishAsync(new Removed<IWidgetComponentViewModel>(item.Value),
-        //        nameof(PrimaryWidgetViewModel),
-        //            cancellationToken);
-        //}
     }
 }
diff --git a/Hyperbar.Windows.Primary/WidgetComponentViewModelFactory.cs b/Hyperbar.Windows.Primary/WidgetComponentViewModelFactory.cs
index de4ce2d..7402328 100644
--- a/Hyperbar.Windows.Primary/WidgetComponentViewModelFactory.cs
+++ b/Hyperbar.Windows.Primary/WidgetComponentViewModelFactory.cs
@@ -2,20 +2,6 @@
 
 namespace Hyperbar.Windows.Primary;
 
-public class WidgetComponentViewModelProvider(ICache<Guid, IWidgetComponentViewModel> cache) :
-    IProvider<PrimaryCommandConfiguration, IWidgetComponentViewModel?>
-{
-    public IWidgetComponentViewModel? Get(PrimaryCommandConfiguration value)
-    {
-        if (cache.TryGetValue(value.Id, out IWidgetComponentViewModel? viewModel))
-        {
-            return viewModel;
-        }
-
-        return default;
-    }
-}
-
 public class WidgetComponentViewModelFactory(IServiceFactory service,
     IMediator mediator,
     ICache<Guid, IWidgetComponentViewModel> cache) :
diff --git a/Hyperbar.Windows.Primary/WidgetComponentViewModelProvider.cs b/Hyperbar.Windows.Primary/WidgetComponentViewModelProvider.cs
new file mode 100644
index 0000000..455c98d
--- /dev/null
+++ b/Hyperbar.Windows.Primary/WidgetComponentViewModelProvider.cs
@@ -0,0 +1,15 @@
+namespace Hyperbar.Windows.Primary;
+
+public class WidgetComponentViewModelProvider(ICache<Guid, IWidgetComponentViewModel> cache) :
+    IProvider<PrimaryCommandConfiguration, IWidgetComponentViewModel?>
+{
+    public IWidgetComponentViewModel? Get(PrimaryCommandConfiguration value)
+    {
+        if (cache.TryGetValue(value.Id, out IWidgetComponentViewModel? viewModel))
+        {
+            return viewModel;
+        }
+
+        return default;
+    }
+}
diff --git a/Hyperbar/Lifecycles/IFactory.cs b/Hyperbar/Lifecycles/IFactory.cs
index 46093c7..7b73e95 100644
--- a/Hyperbar/Lifecycles/IFactory.cs
+++ b/Hyperbar/Lifecycles/IFactory.cs
@@ -10,15 +10,3 @@ public interface IFactory<TService>
 {
     TService? Create();
 }
-
-
-public interface IProvider<TParameter, TService>
-{
-    TService? Get(TParameter value);
-}
-
-
-public interface IProvider<TService>
-{
-    TService? Get();
-}
diff --git a/Hyperbar/Lifecycles/IProvider.cs b/Hyperbar/Lifecycles/IProvider.cs
new file mode 100644
index 0000000..a8d24bc
--- /dev/null
+++ b/Hyperbar/Lifecycles/IProvider.cs
@@ -0,0 +1,11 @@
+namespace Hyperbar;
+
+public interface IProvider<TParameter, TService>
+{
+    TService? Get(TParameter value);
+}
+
+public interface IProvider<TService>
+{
+    TService? Get();
+}
\ No newline at end of file