Refactoring

pierre3 · Jan 20, 2023 · 8f09b5d · 8f09b5d
1 parent b7864cd
commit 8f09b5d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/Mine2DDesigner/Services/IDialogServiceProvider.cs b/Mine2DDesigner/Services/IDialogServiceProvider.cs
@@ -5,6 +5,6 @@ namespace Mine2DDesigner.Services
     public interface IDialogServiceProvider
     {
         DialogServiceCollection Services { get; }
-        void AddService(IDialogService service);
+        IDialogServiceProvider AddService(IDialogService service);
     }
 }
diff --git a/Mine2DDesigner/ViewModels/MainWindowViewModel.cs b/Mine2DDesigner/ViewModels/MainWindowViewModel.cs
@@ -538,9 +538,10 @@ void IPaintPlane.PaintZY(IGraphics g)
             blockAria.PaintZY(g);
         }
 
-        public void AddService(IDialogService service)
+        public IDialogServiceProvider AddService(IDialogService service)
         {
             Services.Add(service);
+            return this;
         }
     }
 

diff --git a/Mine2DDesigner/Views/MainWindow.xaml.cs b/Mine2DDesigner/Views/MainWindow.xaml.cs
@@ -33,12 +33,13 @@ public MainWindow()
             }
             if (DataContext is IDialogServiceProvider serviceProvider)
             {
-                serviceProvider.AddService(new SelectBlockWindowService(this));
-                serviceProvider.AddService(new NewProjectWindowService(this));
-                serviceProvider.AddService(new OpenFileDialogService(this));
-                serviceProvider.AddService(new SaveFileDialogService(this));
-                serviceProvider.AddService(new SettingsWindowService(this));
-                serviceProvider.AddService(new SendBlocksWindowService(this));
+                serviceProvider
+                    .AddService(new SelectBlockWindowService(this))
+                    .AddService(new NewProjectWindowService(this))
+                    .AddService(new OpenFileDialogService(this))
+                    .AddService(new SaveFileDialogService(this))
+                    .AddService(new SettingsWindowService(this))
+                    .AddService(new SendBlocksWindowService(this));
             }
         }
 

diff --git a/Mine2DDesigner/Views/Services/SendBlocksWindowService.cs b/Mine2DDesigner/Views/Services/SendBlocksWindowService.cs
@@ -1,5 +1,4 @@
-using Microsoft.Win32;
-using Mine2DDesigner.Services;
+using Mine2DDesigner.Services;
 using Mine2DDesigner.ViewModels;
 using System;
 using System.Windows;
@@ -17,10 +16,12 @@ public SendBlocksWindowService(Window owner)
 
         public bool? ShowDialog(IDialogViewModel vm)
         {
-            var window = new SendBlocksWindow(vm);
-            window.Owner = owner;
-            window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            window.Topmost= true;
+            var window = new SendBlocksWindow(vm)
+            {
+                Owner = owner,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                Topmost = true
+            };
             owner.IsEnabled = false;
             window.Show();
             window.Closed += (_, _) => { owner.IsEnabled = true; };