Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs =================================================================== diff -u -r6436 -r6980 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs (.../CsvExportCharacteristicPoints.cs) (revision 6436) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs (.../CsvExportCharacteristicPoints.cs) (revision 6980) @@ -43,7 +43,7 @@ { get { - return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.LocationId; + return csvExportSurfaceLineIdentifiers == null ? "" : csvExportSurfaceLineIdentifiers.LocationId; } } @@ -52,7 +52,7 @@ { get { - return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.SoilProfileId; + return csvExportSurfaceLineIdentifiers == null ? "" : csvExportSurfaceLineIdentifiers.SoilProfileId; } } @@ -61,7 +61,7 @@ { get { - return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.Scenario; + return csvExportSurfaceLineIdentifiers == null ? "" : csvExportSurfaceLineIdentifiers.Scenario; } } @@ -70,7 +70,7 @@ { get { - return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationMechanism; + return csvExportSurfaceLineIdentifiers == null ? "" : csvExportSurfaceLineIdentifiers.CalculationMechanism; } } @@ -79,7 +79,7 @@ { get { - return (csvExportSurfaceLineIdentifiers == null) ? "" : csvExportSurfaceLineIdentifiers.CalculationModel; + return csvExportSurfaceLineIdentifiers == null ? "" : csvExportSurfaceLineIdentifiers.CalculationModel; } } @@ -516,7 +516,7 @@ } } - string GetXfromPoint(SurfaceLine2 line, CharacteristicPointType type) + private string GetXfromPoint(SurfaceLine2 line, CharacteristicPointType type) { GeometryPoint point = line.CharacteristicPoints.GetGeometryPoint(type); double result = -1.0; @@ -528,7 +528,7 @@ return result.ToString("F3", CultureInfo.InvariantCulture); } - string GetYfromPoint(SurfaceLine2 line, CharacteristicPointType type) + private string GetYfromPoint(SurfaceLine2 line, CharacteristicPointType type) { GeometryPoint point = line.CharacteristicPoints.GetGeometryPoint(type); double result = -1.0; @@ -540,7 +540,7 @@ return result.ToString("F3", CultureInfo.InvariantCulture); } - string GetZfromPoint(SurfaceLine2 line, CharacteristicPointType type) + private string GetZfromPoint(SurfaceLine2 line, CharacteristicPointType type) { GeometryPoint point = line.CharacteristicPoints.GetGeometryPoint(type); double result = -1.0;