Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r6776 -r6779 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 6779) @@ -872,7 +872,7 @@ { // // Location Property Importer - // This is where all the attribute values are read form the shapefiles + // This is where all the attribute values are read from the shapefiles // var importer = new LocationPropertyImporter(importFolder, dataAttributesList) { Index: DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj =================================================================== diff -u -r6753 -r6779 --- DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 6753) +++ DamClients/DamUI/trunk/src/Dam/Forms/Deltares.Dam.Forms.csproj (.../Deltares.Dam.Forms.csproj) (revision 6779) @@ -128,7 +128,7 @@ - + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj =================================================================== diff -u -r6766 -r6779 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 6766) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/Deltares.Dam.IntegrationTests.csproj (.../Deltares.Dam.IntegrationTests.csproj) (revision 6779) @@ -332,21 +332,12 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest PreserveNewest - - PreserveNewest - PreserveNewest Index: DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml =================================================================== diff -u -r6439 -r6779 --- DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 6439) +++ DamClients/DamUI/trunk/src/Dam/Forms/Translations.xml (.../Translations.xml) (revision 6779) @@ -128,4 +128,9 @@ + + + ); \ No newline at end of file Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj =================================================================== diff -u -r6753 -r6779 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj (.../Deltares.Dam.TestHelper.csproj) (revision 6753) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/Deltares.Dam.TestHelper.csproj (.../Deltares.Dam.TestHelper.csproj) (revision 6779) @@ -8,6 +8,6 @@ - + Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs =================================================================== diff -u -r6766 -r6779 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs (.../ImportTests.cs) (revision 6766) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.IntegrationTests/ImportTests.cs (.../ImportTests.cs) (revision 6779) @@ -58,7 +58,7 @@ // Write all log messages to a file File.WriteAllLines(Path.ChangeExtension(damDataSourceFileName, ".log"), LogManager.Messages.Select(m => m.ToString())); - Assert.That(LogManager.Messages.Count, Is.EqualTo(25)); + Assert.That(LogManager.Messages.Count, Is.EqualTo(24)); } /// Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj =================================================================== diff -u -r6753 -r6779 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 6753) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Deltares.Dam.Data.csproj (.../Deltares.Dam.Data.csproj) (revision 6779) @@ -50,7 +50,7 @@ - + Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs =================================================================== diff -u -r6776 -r6779 --- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6776) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs (.../DamPlugin.cs) (revision 6779) @@ -59,6 +59,7 @@ using DevExpress.XtraEditors.Controls; using DevExpress.XtraEditors.Repository; using DevExpress.XtraTreeList.Nodes; +using ConversionHelper = Deltares.Dam.Data.DamEngineIo.ConversionHelper; using Location = Deltares.Dam.Data.Location; using ProgressDelegate = Deltares.DamEngine.Data.Standard.Calculation.ProgressDelegate; using Sensor = Deltares.Dam.Data.Sensors.Sensor; @@ -684,8 +685,9 @@ if (!mainForm.AllowMultiCoreSelection) { // Multicore calculation not enabled - ThrowHelper.ThrowWhenConditionIsTrue( - "Multicore is currently not supported. Change number of cores to 1 in Tools menu.", () => damEngineInterface.DamProjectData.MaxCalculationCores > 1); + ThrowHelper.ThrowWhenConditionIsTrue(LocalizationManager.GetTranslatedText(this, "MultiCoreNotSupported"), + () => damEngineInterface.DamProjectData.MaxCalculationCores > 1); + } // only if validation is ok, then @@ -702,7 +704,19 @@ } else { - LogManager.Add(new LogMessage(LogMessageType.Error, typeof(EngineInterface), string.Format("{0}", validationMessages))); + Output outputValidation = DamXmlSerialization.LoadOutputFromXmlString(validationMessages); + foreach (var validationResult in outputValidation.ValidationResults) + { + LogManager.Add(new LogMessage(ConversionHelper.ConvertToMessageType(validationResult.MessageType), typeof(EngineInterface), validationResult.Message1)); + } + foreach (var calculationMessage in outputValidation.Results.CalculationMessages) + { + LogManager.Add(new LogMessage(ConversionHelper.ConvertToMessageType(calculationMessage.MessageType), typeof(EngineInterface), calculationMessage.Message1)); + } + if (LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error)) + { + throw new Exception(LocalizationManager.GetTranslatedText(this, "ValidationErrorsOccurred")); + } } } catch (Exception e)