From 7f06f271cc32e9fdbc065b5779a665b687efce0a Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 5 Jun 2015 21:18:24 +0100 Subject: [PATCH] Removed separate interface files for ViewModels --- Filtration/Filtration.csproj | 4 ---- .../ViewModels/ILootFilterBlockViewModel.cs | 16 --------------- .../ViewModels/ILootFilterScriptViewModel.cs | 20 ------------------- Filtration/ViewModels/IMainWindowViewModel.cs | 6 ------ .../ViewModels/LootFilterBlockViewModel.cs | 7 +++++++ .../ViewModels/LootFilterScriptViewModel.cs | 9 +++++++++ Filtration/ViewModels/MainWindowViewModel.cs | 4 ++++ Filtration/Views/IMainWindow.cs | 7 ------- Filtration/Views/MainWindow.xaml.cs | 5 +++++ 9 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 Filtration/ViewModels/ILootFilterBlockViewModel.cs delete mode 100644 Filtration/ViewModels/ILootFilterScriptViewModel.cs delete mode 100644 Filtration/ViewModels/IMainWindowViewModel.cs delete mode 100644 Filtration/Views/IMainWindow.cs diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index 0e1ebd0..3a697c2 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -150,8 +150,6 @@ - - @@ -215,9 +213,7 @@ App.xaml Code - - MainWindow.xaml Code diff --git a/Filtration/ViewModels/ILootFilterBlockViewModel.cs b/Filtration/ViewModels/ILootFilterBlockViewModel.cs deleted file mode 100644 index 4a055c0..0000000 --- a/Filtration/ViewModels/ILootFilterBlockViewModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel; -using Filtration.Models; -using GalaSoft.MvvmLight.CommandWpf; - -namespace Filtration.ViewModels -{ - internal interface ILootFilterBlockViewModel - { - void Initialise(LootFilterBlock lootFilterBlock); - bool IsDirty { get; set; } - LootFilterBlock Block { get; } - RelayCommand CopyBlockCommand { get; } - string BlockDescription { get; set; } - event PropertyChangedEventHandler PropertyChanged; - } -} \ No newline at end of file diff --git a/Filtration/ViewModels/ILootFilterScriptViewModel.cs b/Filtration/ViewModels/ILootFilterScriptViewModel.cs deleted file mode 100644 index 6ecb2ca..0000000 --- a/Filtration/ViewModels/ILootFilterScriptViewModel.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System.Collections.ObjectModel; -using System.ComponentModel; -using Filtration.Models; - -namespace Filtration.ViewModels -{ - internal interface ILootFilterScriptViewModel - { - ObservableCollection LootFilterBlockViewModels { get; } - LootFilterScript Script { get; } - bool IsDirty { get; } - string Description { get; set; } - string Filename { get; } - string DisplayName { get; } - string Filepath { get; } - void Initialise(LootFilterScript lootFilterScript); - void RemoveDirtyFlag(); - event PropertyChangedEventHandler PropertyChanged; - } -} \ No newline at end of file diff --git a/Filtration/ViewModels/IMainWindowViewModel.cs b/Filtration/ViewModels/IMainWindowViewModel.cs deleted file mode 100644 index 9bf09b1..0000000 --- a/Filtration/ViewModels/IMainWindowViewModel.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Filtration.ViewModels -{ - internal interface IMainWindowViewModel - { - } -} \ No newline at end of file diff --git a/Filtration/ViewModels/LootFilterBlockViewModel.cs b/Filtration/ViewModels/LootFilterBlockViewModel.cs index dd5f1d0..a2b5309 100644 --- a/Filtration/ViewModels/LootFilterBlockViewModel.cs +++ b/Filtration/ViewModels/LootFilterBlockViewModel.cs @@ -13,6 +13,13 @@ using GalaSoft.MvvmLight.CommandWpf; namespace Filtration.ViewModels { + internal interface ILootFilterBlockViewModel + { + void Initialise(LootFilterBlock lootFilterBlock); + bool IsDirty { get; set; } + LootFilterBlock Block { get; } + } + internal class LootFilterBlockViewModel : FiltrationViewModelBase, ILootFilterBlockViewModel { private readonly ILootFilterBlockTranslator _translator; diff --git a/Filtration/ViewModels/LootFilterScriptViewModel.cs b/Filtration/ViewModels/LootFilterScriptViewModel.cs index f3338ae..1a4d2a6 100644 --- a/Filtration/ViewModels/LootFilterScriptViewModel.cs +++ b/Filtration/ViewModels/LootFilterScriptViewModel.cs @@ -9,6 +9,15 @@ using GalaSoft.MvvmLight.CommandWpf; namespace Filtration.ViewModels { + internal interface ILootFilterScriptViewModel + { + LootFilterScript Script { get; } + bool IsDirty { get; } + string Description { get; set; } + void Initialise(LootFilterScript lootFilterScript); + void RemoveDirtyFlag(); + } + internal class LootFilterScriptViewModel : FiltrationViewModelBase, ILootFilterScriptViewModel { private readonly ILootFilterBlockViewModelFactory _lootFilterBlockViewModelFactory; diff --git a/Filtration/ViewModels/MainWindowViewModel.cs b/Filtration/ViewModels/MainWindowViewModel.cs index 127b7bf..6c6edaf 100644 --- a/Filtration/ViewModels/MainWindowViewModel.cs +++ b/Filtration/ViewModels/MainWindowViewModel.cs @@ -11,6 +11,10 @@ using OpenFileDialog = Microsoft.Win32.OpenFileDialog; namespace Filtration.ViewModels { + internal interface IMainWindowViewModel + { + } + internal class MainWindowViewModel : FiltrationViewModelBase, IMainWindowViewModel { private LootFilterScript _loadedScript; diff --git a/Filtration/Views/IMainWindow.cs b/Filtration/Views/IMainWindow.cs deleted file mode 100644 index d8a0e2f..0000000 --- a/Filtration/Views/IMainWindow.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Filtration.Views -{ - public interface IMainWindow - { - void Show(); - } -} diff --git a/Filtration/Views/MainWindow.xaml.cs b/Filtration/Views/MainWindow.xaml.cs index 99c8e87..0917881 100644 --- a/Filtration/Views/MainWindow.xaml.cs +++ b/Filtration/Views/MainWindow.xaml.cs @@ -2,6 +2,11 @@ namespace Filtration.Views { + public interface IMainWindow + { + void Show(); + } + internal partial class MainWindow : IMainWindow { public MainWindow(IMainWindowViewModel mainWindowViewModel)