Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 04:07:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove yoda conditions

Browse Source 
part of refactoring for PR #494
This commit is contained in:
bao-qian
2016-02-22 21:47:10 +00:00
parent 43bfeff2be
commit e2338fcedf
5 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Wox/PublicAPIInstance.cs
View File

@@ -37,16 +37,12 @@ namespace Wox
if(e.KeyEventArgs.Key == Key.Back) if(e.KeyEventArgs.Key == Key.Back)
{ {
if (null != BackKeyDownEvent) BackKeyDownEvent?.Invoke(new WoxKeyDownEventArgs
{ {
BackKeyDownEvent(new WoxKeyDownEventArgs Query = MainVM.QueryText,
{ keyEventArgs = e.KeyEventArgs
Query = MainVM.QueryText, });
keyEventArgs = e.KeyEventArgs
});
}
} }
}; };
} }

10
Wox/ViewModel/BaseViewModel.cs
View File

@@ -9,10 +9,7 @@ namespace Wox.ViewModel
protected void OnPropertyChanged(string propertyName) protected void OnPropertyChanged(string propertyName)
{ {
if (null != PropertyChanged) PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
{
PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
} }
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@@ -37,10 +34,7 @@ namespace Wox.ViewModel
public virtual void Execute(object parameter) public virtual void Execute(object parameter)
{ {
if (null != _action) _action?.Invoke(parameter);
{
_action(parameter);
}
} }
} }
} }

4
Wox/ViewModel/MainViewModel.cs
View File

@@ -287,7 +287,7 @@ namespace Wox.ViewModel
ShiftEnterCommand = new RelayCommand(_ => ShiftEnterCommand = new RelayCommand(_ =>
{ {
if (!IsContextMenuVisible && null != Results.SelectedResult) if (!IsContextMenuVisible && Results.SelectedResult != null)
{ {
ShowContextMenu(Results.SelectedResult.RawResult); ShowContextMenu(Results.SelectedResult.RawResult);
} }
@@ -295,7 +295,7 @@ namespace Wox.ViewModel
OpenResultCommand = new RelayCommand(o => OpenResultCommand = new RelayCommand(o =>
{ {
if (null != o) if (o != null)
{ {
var index = int.Parse(o.ToString()); var index = int.Parse(o.ToString());
Results.SelectResult(index); Results.SelectResult(index);

2
Wox/ViewModel/ResultViewModel.cs
View File

@@ -19,7 +19,7 @@ namespace Wox.ViewModel
public ResultViewModel(Result result) public ResultViewModel(Result result)
{ {
if (null != result) if (result != null)
{ {
RawResult = result; RawResult = result;

14
Wox/ViewModel/ResultsViewModel.cs
View File

@@ -35,16 +35,16 @@ namespace Wox.ViewModel
} }
set set
{ {
if (null != value) if (value != null)
{ {
if (null != _selectedResult) if (_selectedResult != null)
{ {
_selectedResult.IsSelected = false; _selectedResult.IsSelected = false;
} }
_selectedResult = value; _selectedResult = value;
if (null != _selectedResult) if (_selectedResult != null)
{ {
_selectedResult.IsSelected = true; _selectedResult.IsSelected = true;
} }
@@ -106,7 +106,7 @@ namespace Wox.ViewModel
public void SelectNextResult() public void SelectNextResult()
{ {
if (null != SelectedResult) if (SelectedResult != null)
{ {
var index = Results.IndexOf(SelectedResult); var index = Results.IndexOf(SelectedResult);
if (index == Results.Count - 1) if (index == Results.Count - 1)
@@ -119,7 +119,7 @@ namespace Wox.ViewModel
public void SelectPrevResult() public void SelectPrevResult()
{ {
if (null != SelectedResult) if (SelectedResult != null)
{ {
var index = Results.IndexOf(SelectedResult); var index = Results.IndexOf(SelectedResult);
if (index == 0) if (index == 0)
@@ -133,7 +133,7 @@ namespace Wox.ViewModel
public void SelectNextPage() public void SelectNextPage()
{ {
var index = 0; var index = 0;
if (null != SelectedResult) if (SelectedResult != null)
{ {
index = Results.IndexOf(SelectedResult); index = Results.IndexOf(SelectedResult);
} }
@@ -148,7 +148,7 @@ namespace Wox.ViewModel
public void SelectPrevPage() public void SelectPrevPage()
{ {
var index = 0; var index = 0;
if (null != SelectedResult) if (SelectedResult != null)
{ {
index = Results.IndexOf(SelectedResult); index = Results.IndexOf(SelectedResult);
} }