From f26538978d2ee832d29e273a3ee0377cacb1e683 Mon Sep 17 00:00:00 2001
From: PeterForstmeier <peter.forstmeier@t-online.de>
Date: Sun, 16 Sep 2012 19:03:53 +0200
Subject: [PATCH] Cleanup C# BuildOptions, remove BaseAdressValidator

---
 .../Src/OptionPanels/BuildOptions.xaml        | 11 -------
 .../Src/OptionPanels/BuildOptions.xaml.cs     | 33 ++++++++++---------
 .../ProjectOptions/HexValidator.cs            |  4 ++-
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
index aff83f339b..ba52b8785c 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml
@@ -224,17 +224,6 @@
 							<Label Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right"
 							       Content="{core:Localize Dialog.ProjectOptions.Build.DLLBaseAddress}"></Label>
 							
-							<!-- Hex binding
-							
-							<TextBox x:Name="dllBaseAddressTextBox" Grid.Row="4" Grid.Column="2">
-								<TextBox.Text>
-									<Binding Path="DllBaseAdress" UpdateSourceTrigger="PropertyChanged">
-										<Binding.ValidationRules>
-											<optionpanels:BaseAdressValidator />
-										</Binding.ValidationRules>
-									</Binding>
-								</TextBox.Text>
-							</TextBox> -->
 							
 							<!--x:Name="dllBaseAddressTextBox"-->
 							<TextBox  Grid.Row="4" Grid.Column="2"
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
index 23d41624ba..ed3b288c6c 100644
--- a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
+++ b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
@@ -73,21 +73,6 @@ namespace CSharpBinding.OptionPanels
 		}
 		
 		
-		protected override void Initialize()
-		{
-			this.UpdateProjectCommand  = new RelayCommand(UpdateProjectExecute);
-			this.ChangeOutputPath = new RelayCommand(ChangeOutputPathExecute);
-			UpdateTargetFrameworkCombo();
-			if (DocumentationFile.Value.Length > 0) {
-				documentFileIsChecked = true;
-			}
-			XmlDocHelper();
-			this.BaseIntermediateOutputPathCommand = new RelayCommand(BaseIntermediateOutputPathExecute);
-			this.IntermediateOutputPathCommand = new RelayCommand(IntermediateOutputPathExecute);
-			SetTreatWarningAsErrorRadioButtons();
-			
-		}
-		
 		#region properties
 		
 		public ProjectProperty<string> DefineConstants {
@@ -187,6 +172,22 @@ namespace CSharpBinding.OptionPanels
 		
 		#region overrides
 		
+		protected override void Initialize()
+		{
+			this.UpdateProjectCommand  = new RelayCommand(UpdateProjectExecute);
+			this.ChangeOutputPath = new RelayCommand(ChangeOutputPathExecute);
+			UpdateTargetFrameworkCombo();
+			if (DocumentationFile.Value.Length > 0) {
+				documentFileIsChecked = true;
+			}
+			XmlDocHelper();
+			this.BaseIntermediateOutputPathCommand = new RelayCommand(BaseIntermediateOutputPathExecute);
+			this.IntermediateOutputPathCommand = new RelayCommand(IntermediateOutputPathExecute);
+			SetTreatWarningAsErrorRadioButtons();
+			
+		}
+		
+		
 		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
 		{
 			base.Load(project, configuration, platform);
@@ -217,6 +218,8 @@ namespace CSharpBinding.OptionPanels
 			}
 			return base.Save(project, configuration, platform);
 		}
+		
+		
 		#endregion
 		
 		#region Documentation File
diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
index d5b798a36f..85165bf4c2 100644
--- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
+++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/HexValidator.cs
@@ -30,7 +30,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			return result;
 		}
 	}
-	
+	/*
 	public class  BaseAdressValidator :ValidationRule
 	{
 		public override ValidationResult Validate(object value, CultureInfo cultureInfo)
@@ -49,5 +49,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
 			}
 			return result;
 		}
+		
 	}
+	*/
 }