From 28b41751cbe7684b81316ba8d898b2cb61bea348 Mon Sep 17 00:00:00 2001 From: Hunter T Date: Thu, 14 Mar 2024 15:29:52 -0700 Subject: [PATCH] Refactor file/class location --- .../ComboBoxParameterViewModelTests.cs | 1 + ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs | 2 ++ ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj | 4 ---- ActiveDirectoryQuerier/MainWindowViewModel.cs | 2 +- .../{ => ViewModels}/ComboBoxParameterViewModel.cs | 2 +- ActiveDirectoryQuerier/{ => ViewModels}/TextBoxViewModel.cs | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) rename ActiveDirectoryQuerier/{ => ViewModels}/ComboBoxParameterViewModel.cs (97%) rename ActiveDirectoryQuerier/{ => ViewModels}/TextBoxViewModel.cs (95%) diff --git a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs index a4033d9..a98c571 100644 --- a/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs +++ b/ActiveDirectoryQuerier.Tests/ComboBoxParameterViewModelTests.cs @@ -2,6 +2,7 @@ using System.Management.Automation.Runspaces; using ActiveDirectoryQuerier.ActiveDirectory; using ActiveDirectoryQuerier.PowerShell; +using ActiveDirectoryQuerier.ViewModels; namespace ActiveDirectoryQuerier.Tests; diff --git a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs index 08ab025..87aa8f4 100644 --- a/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs +++ b/ActiveDirectoryQuerier.Tests/TextBoxViewModelTests.cs @@ -1,3 +1,5 @@ +using ActiveDirectoryQuerier.ViewModels; + namespace ActiveDirectoryQuerier.Tests; public class TextBoxViewModelTests diff --git a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj index 0c49a0c..1efb6dd 100644 --- a/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj +++ b/ActiveDirectoryQuerier/ActiveDirectoryQuerier.csproj @@ -25,8 +25,4 @@ - - - - diff --git a/ActiveDirectoryQuerier/MainWindowViewModel.cs b/ActiveDirectoryQuerier/MainWindowViewModel.cs index 23d3fe1..1f30b7d 100644 --- a/ActiveDirectoryQuerier/MainWindowViewModel.cs +++ b/ActiveDirectoryQuerier/MainWindowViewModel.cs @@ -10,11 +10,11 @@ using ActiveDirectoryQuerier.ActiveDirectory; using ActiveDirectoryQuerier.PowerShell; using ActiveDirectoryQuerier.Queries; +using ActiveDirectoryQuerier.ViewModels; using Microsoft.Win32; namespace ActiveDirectoryQuerier; -/// TODO: Place class into ViewModel folder. public sealed class MainWindowViewModel : INotifyPropertyChanged { // [ Fields ] ------------------------------------------------------------------- // diff --git a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs b/ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs similarity index 97% rename from ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs rename to ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs index 7c966ae..9f60bbb 100644 --- a/ActiveDirectoryQuerier/ComboBoxParameterViewModel.cs +++ b/ActiveDirectoryQuerier/ViewModels/ComboBoxParameterViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; -namespace ActiveDirectoryQuerier; +namespace ActiveDirectoryQuerier.ViewModels; /// /// ViewModel for a ComboBox that displays possible parameters for a PowerShell command. diff --git a/ActiveDirectoryQuerier/TextBoxViewModel.cs b/ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs similarity index 95% rename from ActiveDirectoryQuerier/TextBoxViewModel.cs rename to ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs index 783a027..b81e606 100644 --- a/ActiveDirectoryQuerier/TextBoxViewModel.cs +++ b/ActiveDirectoryQuerier/ViewModels/TextBoxViewModel.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace ActiveDirectoryQuerier; +namespace ActiveDirectoryQuerier.ViewModels; /// /// ViewModel for a TextBox that contains the value of a parameter slot.