Index: trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs
===================================================================
diff -u -r7 -r48
--- trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs	(.../DesignCalculationPropertyControl.cs)	(revision 7)
+++ trunk/src/Dam/Forms/DesignCalculationPropertyControl.cs	(.../DesignCalculationPropertyControl.cs)	(revision 48)
@@ -24,25 +24,24 @@
             InitializeComponent();
 
             this.Name = "Calculation";
-            //result.PipingFactor
-            BindSupport.BindTextAndValue(this, this.LocationLabel, this.LocationEdit, typeof(CsvExportData), "LocationName");
-            BindSupport.BindTextAndValue(this, this.ProfileLabel, this.ProfileEdit, typeof(CsvExportData), "ProfileName");
-            BindSupport.BindTextAndValue(this, this.ModelLabel, this.ModelEdit, typeof(CsvExportData), "StabilityModel");
-            BindSupport.BindTextAndValue(this, this.ModelPipingLabel, this.ModelPipingEdit, typeof(CsvExportData), "PipingModel");
-            BindSupport.BindTextAndValue(this, this.ScenarioLabel, this.ScenarioEdit, typeof(CsvExportData), "ScenarioName");
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.LocationLabel, this.LocationEdit, a => a.LocationName);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.ProfileLabel, this.ProfileEdit, a => a.ProfileName);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.ModelLabel, this.ModelEdit, a => a.StabilityModel);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.ModelPipingLabel, this.ModelPipingEdit, a => a.PipingModel);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.ScenarioLabel, this.ScenarioEdit, a => a.ScenarioName);
 
-            BindSupport.BindTextValueAndUnit(this, this.SafetyFactorLabel, this.SafetyFactorEdit, typeof(CsvExportData), "SafetyFactor");
-            BindSupport.BindTextAndValue(this, this.CalculationLabel, this.CalculationComboBox, typeof(CsvExportData), "CalculationResult");
-            BindSupport.BindTextAndValue(this, this.NumberOfIterationsLabel, this.NumberOfIterationsEdit, typeof(CsvExportData), "NumberOfIterations");
+            BindSupport.BindTextValueAndUnit<CsvExportData>(this, this.SafetyFactorLabel, this.SafetyFactorEdit, a => a.SafetyFactor);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.CalculationLabel, this.CalculationComboBox, a => a.CalculationResult);
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.NumberOfIterationsLabel, this.NumberOfIterationsEdit, a => a.NumberOfIterations);
 
-            BindSupport.Bind(this, this.AcceptedCheckEdit, typeof(CsvExportData), "ResultEvaluation", ResultEvaluation.Accepted);
-            BindSupport.Bind(this, this.RejectedCheckEdit, typeof(CsvExportData), "ResultEvaluation", ResultEvaluation.Rejected);
-            BindSupport.Bind(this, this.NotEvaluatedCheckEdit, typeof(CsvExportData), "ResultEvaluation", ResultEvaluation.NotEvaluated);
+            BindSupport.Bind<CsvExportData>(this, this.AcceptedCheckEdit, a => a.ResultEvaluation, ResultEvaluation.Accepted);
+            BindSupport.Bind<CsvExportData>(this, this.RejectedCheckEdit, a => a.ResultEvaluation, ResultEvaluation.Rejected);
+            BindSupport.Bind<CsvExportData>(this, this.NotEvaluatedCheckEdit, a => a.ResultEvaluation, ResultEvaluation.NotEvaluated);
 
             //#Best name in edits added
             LocalizationSupport.Register(typeof(CsvExportData), this.AcceptedCheckEdit, this.RejectedCheckEdit, this.NotEvaluatedCheckEdit, this.groupControl1, this.groupControl2, this.EvaluationGroupControl);
 
-            BindSupport.BindTextAndValue(this, this.NotesLabel, this.NotesEdit, typeof(CsvExportData), "Notes");
+            BindSupport.BindTextAndValue<CsvExportData>(this, this.NotesLabel, this.NotesEdit, a => a.Notes);
             
             BindSupport.Bind(this, OpenFileButton, typeof(CsvExportData), "OpenCalculationFile");
             BindSupport.Assign(this.EvaluationGroupControl, this);