Index: DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs =================================================================== diff -u -r875 -r2035 --- DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs (.../CsvExporterTest.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/CsvExporterTest.cs (.../CsvExporterTest.cs) (revision 2035) @@ -123,5 +123,23 @@ [CsvExportColumn("Naam", 1)] public string Name { get; set; } } + + [Test] + public void TestRemoveCarriageReturnsFromMessage() + { + var text = "text1.\r\ntext2.\r\n"; + CsvExportData.RemoveCarriageReturnsFromMessage(ref text); + Assert.AreEqual("text1. text2.", text); + } + + [Test] + public void TestRemoveCarriageReturnsFromResultMessage() + { + var csvExportData = new CsvExportData(); + csvExportData.ResultMessage = "text1.\r\ntext2.\r\n"; + var message = csvExportData.ResultMessage; + Assert.AreEqual("text1. text2.", message); + } + } } \ No newline at end of file Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs =================================================================== diff -u -r1982 -r2035 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 1982) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportData.cs (.../CsvExportData.cs) (revision 2035) @@ -385,10 +385,23 @@ [ReadOnly(true)] public string ResultMessage { - get { return resultMessage; } + get + { + RemoveCarriageReturnsFromMessage(ref resultMessage); + return resultMessage; + } set { resultMessage = value; } } + public static void RemoveCarriageReturnsFromMessage(ref string message) + { + // remove carriage return at the end + message = message.TrimEnd('\r', '\n'); + // replace other carriage returns by a space + message = message.Replace("\r\n", " "); + } + + [CsvExportColumn("X", 6)] [Label("Global X-coordinate")] [Format("F3")]