Restored useless changes

Code cleanup
This commit is contained in:
BONNEVILLE Geoffroy
2018-08-03 17:41:52 +02:00
parent 6f96e698ec
commit e437f65f83
7 changed files with 21 additions and 30 deletions

View File

@@ -37,7 +37,7 @@ namespace ModernKeePass.Common
public RelayCommand(Action execute, Func<bool> canExecute)
{
if (execute == null)
throw new ArgumentNullException("execute");
throw new ArgumentNullException(nameof(execute));
_execute = execute;
_canExecute = canExecute;
}
@@ -72,11 +72,7 @@ namespace ModernKeePass.Common
/// </summary>
public void RaiseCanExecuteChanged()
{
var handler = CanExecuteChanged;
if (handler != null)
{
handler(this, EventArgs.Empty);
}
CanExecuteChanged?.Invoke(this, EventArgs.Empty);
}
}
}

View File

@@ -23,7 +23,6 @@ namespace ModernKeePass.Interfaces
/// Restore ViewModel
/// </summary>
ICommand UndoDeleteCommand { get; }
ICommand GoBackCommand { get; set; }
/// <summary>
/// Move a entity to the destination group
/// </summary>

View File

@@ -197,7 +197,6 @@ namespace ModernKeePass.ViewModels
public ICommand SaveCommand { get; }
public ICommand GeneratePasswordCommand { get; }
public ICommand UndoDeleteCommand { get; }
public ICommand GoBackCommand { get; set; }
public event PropertyChangedEventHandler PropertyChanged;

View File

@@ -118,7 +118,6 @@ namespace ModernKeePass.ViewModels
public ICommand SortEntriesCommand { get; }
public ICommand SortGroupsCommand { get; }
public ICommand UndoDeleteCommand { get; }
public ICommand GoBackCommand { get; set; }
private readonly PwGroup _pwGroup;
private readonly IDatabaseService _database;

View File

@@ -44,7 +44,6 @@ namespace ModernKeePass.Views
NavigationHelper.OnNavigatedTo(e);
if (!(e.Parameter is EntryVm)) return;
DataContext = (EntryVm)e.Parameter;
Model.GoBackCommand = NavigationHelper.GoBackCommand;
}
protected override void OnNavigatedFrom(NavigationEventArgs e)

View File

@@ -56,7 +56,6 @@ namespace ModernKeePass.Views
if (vm != null)
DataContext = vm;
}
Model.GoBackCommand = NavigationHelper.GoBackCommand;
}
protected override void OnNavigatedFrom(NavigationEventArgs e)

View File

@@ -1,6 +1,6 @@
using System;
using System.Windows.Input;
using Windows.UI.Xaml;
using ModernKeePass.Common;
// The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
@@ -8,75 +8,75 @@ namespace ModernKeePass.Views.UserControls
{
public sealed partial class TopMenuUserControl
{
public RelayCommand SaveCommand
public ICommand SaveCommand
{
get { return (RelayCommand)GetValue(SaveCommandProperty); }
get { return (ICommand)GetValue(SaveCommandProperty); }
set { SetValue(SaveCommandProperty, value); }
}
public static readonly DependencyProperty SaveCommandProperty =
DependencyProperty.Register(
"SaveCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));
public RelayCommand EditCommand
public ICommand EditCommand
{
get { return (RelayCommand)GetValue(EditCommandProperty); }
get { return (ICommand)GetValue(EditCommandProperty); }
set { SetValue(EditCommandProperty, value); }
}
public static readonly DependencyProperty EditCommandProperty =
DependencyProperty.Register(
"EditCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));
public RelayCommand DeleteCommand
public ICommand DeleteCommand
{
get { return (RelayCommand)GetValue(DeleteCommandProperty); }
get { return (ICommand)GetValue(DeleteCommandProperty); }
set { SetValue(DeleteCommandProperty, value); }
}
public static readonly DependencyProperty DeleteCommandProperty =
DependencyProperty.Register(
"DeleteCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));
public RelayCommand RestoreCommand
public ICommand RestoreCommand
{
get { return (RelayCommand)GetValue(RestoreCommandProperty); }
get { return (ICommand)GetValue(RestoreCommandProperty); }
set { SetValue(RestoreCommandProperty, value); }
}
public static readonly DependencyProperty RestoreCommandProperty =
DependencyProperty.Register(
"RestoreCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));
public RelayCommand SortEntriesCommand
public ICommand SortEntriesCommand
{
get { return (RelayCommand)GetValue(SortEntriesCommandProperty); }
get { return (ICommand)GetValue(SortEntriesCommandProperty); }
set { SetValue(SortEntriesCommandProperty, value); }
}
public static readonly DependencyProperty SortEntriesCommandProperty =
DependencyProperty.Register(
"SortEntriesCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));
public RelayCommand SortGroupsCommand
public ICommand SortGroupsCommand
{
get { return (RelayCommand)GetValue(SortGroupsCommandProperty); }
get { return (ICommand)GetValue(SortGroupsCommandProperty); }
set { SetValue(SortGroupsCommandProperty, value); }
}
public static readonly DependencyProperty SortGroupsCommandProperty =
DependencyProperty.Register(
"SortGroupsCommand",
typeof(RelayCommand),
typeof(ICommand),
typeof(TopMenuUserControl),
new PropertyMetadata(null, (o, args) => { }));