Browse Source

Use nameof in RaisePropertyChanged calls.

pull/2046/head
Siegfried Pammer 5 years ago
parent
commit
eeba91fba5
  1. 12
      ILSpy/TreeNodes/AssemblyTreeNode.cs
  2. 2
      ILSpy/TreeNodes/ILSpyTreeNode.cs
  3. 2
      SharpTreeView/EditTextBox.cs
  4. 26
      SharpTreeView/SharpTreeNode.cs

12
ILSpy/TreeNodes/AssemblyTreeNode.cs

@ -122,13 +122,13 @@ namespace ICSharpCode.ILSpy.TreeNodes
void OnAssemblyLoaded(Task<PEFile> moduleTask) void OnAssemblyLoaded(Task<PEFile> moduleTask)
{ {
// change from "Loading" icon to final icon // change from "Loading" icon to final icon
RaisePropertyChanged("Icon"); RaisePropertyChanged(nameof(Icon));
RaisePropertyChanged("ExpandedIcon"); RaisePropertyChanged(nameof(ExpandedIcon));
RaisePropertyChanged("Tooltip"); RaisePropertyChanged(nameof(ToolTip));
if (moduleTask.IsFaulted) { if (moduleTask.IsFaulted) {
RaisePropertyChanged("ShowExpander"); // cannot expand assemblies with load error RaisePropertyChanged(nameof(ShowExpander)); // cannot expand assemblies with load error
} else { } else {
RaisePropertyChanged("Text"); // shortname might have changed RaisePropertyChanged(nameof(Text)); // shortname might have changed
} }
} }
@ -431,7 +431,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
var loadedAssm = ((AssemblyTreeNode)node).LoadedAssembly; var loadedAssm = ((AssemblyTreeNode)node).LoadedAssembly;
if (!loadedAssm.HasLoadError && !loadedAssm.FileName.StartsWith("nupkg://")) { if (!loadedAssm.HasLoadError && !loadedAssm.FileName.StartsWith("nupkg://")) {
loadedAssm.IsAutoLoaded = false; loadedAssm.IsAutoLoaded = false;
node.RaisePropertyChanged("Foreground"); node.RaisePropertyChanged(nameof(Foreground));
} }
} }
MainWindow.Instance.CurrentAssemblyList.RefreshSave(); MainWindow.Instance.CurrentAssemblyList.RefreshSave();

2
ILSpy/TreeNodes/ILSpyTreeNode.cs

@ -144,7 +144,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
protected virtual void OnFilterSettingsChanged() protected virtual void OnFilterSettingsChanged()
{ {
RaisePropertyChanged("Text"); RaisePropertyChanged(nameof(Text));
if (IsVisible) { if (IsVisible) {
foreach (ILSpyTreeNode node in this.Children.OfType<ILSpyTreeNode>()) foreach (ILSpyTreeNode node in this.Children.OfType<ILSpyTreeNode>())
ApplyFilterToChild(node); ApplyFilterToChild(node);

2
SharpTreeView/EditTextBox.cs

@ -75,7 +75,7 @@ namespace ICSharpCode.TreeView
if (!Node.SaveEditText(Text)) { if (!Node.SaveEditText(Text)) {
Item.Focus(); Item.Focus();
} }
Node.RaisePropertyChanged("Text"); Node.RaisePropertyChanged(nameof(Text));
//if (Node.SaveEditText(Text)) { //if (Node.SaveEditText(Text)) {
// Node.IsEditing = false; // Node.IsEditing = false;

26
SharpTreeView/SharpTreeNode.cs

@ -148,9 +148,9 @@ namespace ICSharpCode.TreeView
isHidden = value; isHidden = value;
if (modelParent != null) if (modelParent != null)
UpdateIsVisible(modelParent.isVisible && modelParent.isExpanded, true); UpdateIsVisible(modelParent.isVisible && modelParent.isExpanded, true);
RaisePropertyChanged("IsHidden"); RaisePropertyChanged(nameof(IsHidden));
if (Parent != null) if (Parent != null)
Parent.RaisePropertyChanged("ShowExpander"); Parent.RaisePropertyChanged(nameof(ShowExpander));
} }
} }
} }
@ -169,7 +169,7 @@ namespace ICSharpCode.TreeView
set { set {
if (isSelected != value) { if (isSelected != value) {
isSelected = value; isSelected = value;
RaisePropertyChanged("IsSelected"); RaisePropertyChanged(nameof(IsSelected));
} }
} }
} }
@ -233,7 +233,7 @@ namespace ICSharpCode.TreeView
} }
} }
RaisePropertyChanged("ShowExpander"); RaisePropertyChanged(nameof(ShowExpander));
RaiseIsLastChangedIfNeeded(e); RaiseIsLastChangedIfNeeded(e);
} }
#endregion #endregion
@ -266,7 +266,7 @@ namespace ICSharpCode.TreeView
OnCollapsing(); OnCollapsing();
} }
UpdateChildIsVisible(true); UpdateChildIsVisible(true);
RaisePropertyChanged("IsExpanded"); RaisePropertyChanged(nameof(IsExpanded));
} }
} }
} }
@ -286,11 +286,11 @@ namespace ICSharpCode.TreeView
IsExpanded = false; IsExpanded = false;
if (canExpandRecursively) { if (canExpandRecursively) {
canExpandRecursively = false; canExpandRecursively = false;
RaisePropertyChanged("CanExpandRecursively"); RaisePropertyChanged(nameof(CanExpandRecursively));
} }
} }
RaisePropertyChanged("LazyLoading"); RaisePropertyChanged(nameof(LazyLoading));
RaisePropertyChanged("ShowExpander"); RaisePropertyChanged(nameof(ShowExpander));
} }
} }
@ -379,7 +379,7 @@ namespace ICSharpCode.TreeView
{ {
if (isEditing != value) { if (isEditing != value) {
isEditing = value; isEditing = value;
RaisePropertyChanged("IsEditing"); RaisePropertyChanged(nameof(IsEditing));
} }
} }
} }
@ -436,7 +436,7 @@ namespace ICSharpCode.TreeView
} }
} }
RaisePropertyChanged("IsChecked"); RaisePropertyChanged(nameof(IsChecked));
} }
} }
@ -645,15 +645,15 @@ namespace ICSharpCode.TreeView
case NotifyCollectionChangedAction.Add: case NotifyCollectionChangedAction.Add:
if (e.NewStartingIndex == Children.Count - 1) { if (e.NewStartingIndex == Children.Count - 1) {
if (Children.Count > 1) { if (Children.Count > 1) {
Children[Children.Count - 2].RaisePropertyChanged("IsLast"); Children[Children.Count - 2].RaisePropertyChanged(nameof(IsLast));
} }
Children[Children.Count - 1].RaisePropertyChanged("IsLast"); Children[Children.Count - 1].RaisePropertyChanged(nameof(IsLast));
} }
break; break;
case NotifyCollectionChangedAction.Remove: case NotifyCollectionChangedAction.Remove:
if (e.OldStartingIndex == Children.Count) { if (e.OldStartingIndex == Children.Count) {
if (Children.Count > 0) { if (Children.Count > 0) {
Children[Children.Count - 1].RaisePropertyChanged("IsLast"); Children[Children.Count - 1].RaisePropertyChanged(nameof(IsLast));
} }
} }
break; break;

Loading…
Cancel
Save