Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 87bad9ce authored by Markus Quaritsch's avatar Markus Quaritsch
Browse files

more verbose error messages on validation (GUI)

parent 4803f097
No related branches found
No related tags found
No related merge requests found
...@@ -248,7 +248,8 @@ Public Class Engine ...@@ -248,7 +248,8 @@ Public Class Engine
If Not result.Any() Then Return ValidationResult.Success If Not result.Any() Then Return ValidationResult.Success
Return New ValidationResult("Engine Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) Return New ValidationResult("Engine Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
Catch ex As Exception Catch ex As Exception
Return New ValidationResult(ex.Message) Return New ValidationResult(ex.Message)
End Try End Try
......
...@@ -225,13 +225,15 @@ Public Class Gearbox ...@@ -225,13 +225,15 @@ Public Class Gearbox
gearboxData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) gearboxData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("Gearbox Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("Gearbox Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
result = axlegearData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) result = axlegearData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("Axlegear Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("Axlegear Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
Return ValidationResult.Success Return ValidationResult.Success
......
...@@ -120,20 +120,23 @@ Public Class Vehicle ...@@ -120,20 +120,23 @@ Public Class Vehicle
vehicleData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) vehicleData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("Vehicle Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("Vehicle Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
result = retarderData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) result = retarderData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("Retarder Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("Retarder Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
If vehicle.AngledriveType = AngledriveType.SeparateAngledrive Then If vehicle.AngledriveType = AngledriveType.SeparateAngledrive Then
result = angledriveData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) result = angledriveData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("AngleDrive Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("AngleDrive Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
End If End If
...@@ -141,7 +144,8 @@ Public Class Vehicle ...@@ -141,7 +144,8 @@ Public Class Vehicle
result = ptoData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering)) result = ptoData.Validate(If(Cfg.DeclMode, ExecutionMode.Declaration, ExecutionMode.Engineering))
If result.Any() Then If result.Any() Then
Return _ Return _
New ValidationResult("PTO Configuration is invalid. ", result.Select(Function(r) r.ErrorMessage).ToList()) New ValidationResult("PTO Configuration is invalid. ",
result.Select(Function(r) r.ErrorMessage + String.Join(Environment.NewLine, r.MemberNames)).ToList())
End If End If
End If End If
......
...@@ -44,6 +44,8 @@ using System.Runtime.InteropServices; ...@@ -44,6 +44,8 @@ using System.Runtime.InteropServices;
[assembly: Guid("b843f4c2-660b-4a3e-a336-c1f9c20aa993")] [assembly: Guid("b843f4c2-660b-4a3e-a336-c1f9c20aa993")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAPI")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAPI")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoEngineeringAPI")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoEngineeringAPI")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoXML")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("XMLTest")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VECTO")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VECTO")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoCoreTest")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoCoreTest")]
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAPITest")] [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VectoAPITest")]
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment