From c80929d67481daf5fcd9687497467b7b3a98b2cb Mon Sep 17 00:00:00 2001 From: PeterForstmeier Date: Sun, 27 May 2012 19:07:37 +0200 Subject: [PATCH] Remove unused INotifyPropertyChangend --- .../CppBinding/Project/LinkerOptions.xaml.cs | 2 +- .../Project/PreprocessorOptions.xaml.cs | 2 +- .../ProjectOptions/DebugOptions.xaml.cs | 12 +---------- .../ServiceReferenceOptionsPanel..xaml.cs | 20 ++++++------------- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs index 56be948b00..b9186c4b2d 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/LinkerOptions.xaml.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.CppBinding.Project /// /// Interaction logic for LinkerOptionsXaml.xaml /// - public partial class LinkerOptions : ProjectOptionPanel,INotifyPropertyChanged + public partial class LinkerOptions : ProjectOptionPanel { private const string metaElement ="Link"; private MSBuildBasedProject project; diff --git a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs index c68f9f341a..5a8d9b8909 100644 --- a/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs +++ b/src/AddIns/BackendBindings/CppBinding/CppBinding/Project/PreprocessorOptions.xaml.cs @@ -19,7 +19,7 @@ namespace ICSharpCode.CppBinding.Project /// /// Interaction logic for PreprocessorOptionsXaml.xaml /// - public partial class PreprocessorOptions : ProjectOptionPanel,INotifyPropertyChanged + public partial class PreprocessorOptions : ProjectOptionPanel { private const string metaElement ="ClCompile"; private MSBuildBasedProject project; diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.xaml.cs index b57c1da8b0..bd69f6e44c 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.xaml.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/DebugOptions.xaml.cs @@ -23,7 +23,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels /// /// Interaction logic for DebugOptions.xaml /// - public partial class DebugOptions : ProjectOptionPanel,INotifyPropertyChanged + public partial class DebugOptions : ProjectOptionPanel { public DebugOptions() @@ -156,15 +156,5 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels } return startLocation; } - - private void OnPropertyChanged (string propertyName) - { - if (PropertyChanged != null) { - PropertyChanged (this,new System.ComponentModel.PropertyChangedEventArgs(propertyName)); - } - } - - public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged; } - } \ No newline at end of file diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/ServiceReferenceOptionsPanel..xaml.cs b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/ServiceReferenceOptionsPanel..xaml.cs index 99fec45bf3..e48debd877 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/ServiceReferenceOptionsPanel..xaml.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/ServiceReferenceOptionsPanel..xaml.cs @@ -11,7 +11,7 @@ using Microsoft.Win32; namespace ICSharpCode.SharpDevelop.Gui.OptionPanels.ServiceReference { - public partial class ServiceReferenceOptionsPanel : OptionPanel, INotifyPropertyChanged + public partial class ServiceReferenceOptionsPanel : OptionPanel { string svcUtilPath; bool changed; @@ -28,18 +28,19 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels.ServiceReference void Browse() { - var dialog = new OpenFileDialog(); - if (dialog.ShowDialog() ?? false) { - SvcUtilPath = dialog.FileName; + string fileName = OptionsHelper.OpenFile(string.Empty); + if (!String.IsNullOrEmpty(fileName)) { + SvcUtilPath = fileName; } } + public string SvcUtilPath { get { return svcUtilPath; } set { svcUtilPath = value; changed = true; - OnPropertyChanged("SvcUtilPath"); + base.RaisePropertyChanged(() => SvcUtilPath); } } @@ -50,14 +51,5 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels.ServiceReference } return true; } - - public event PropertyChangedEventHandler PropertyChanged; - - void OnPropertyChanged(string name) - { - if (PropertyChanged != null) { - PropertyChanged(this, new PropertyChangedEventArgs(name)); - } - } } } \ No newline at end of file