From f8441d78cd6561bb7c209c16673fba7e7a750a8c Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 3 May 2012 17:12:59 +0200 Subject: [PATCH] Bug #1430: Fix problem with error messages in OrderElementConverter It was using wrong "+" instead of ",". FEA: ItEr76S04BugFixing --- .../ws/common/impl/OrderElementConverter.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java index 4fadfc793..467d3f87a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/common/impl/OrderElementConverter.java @@ -555,9 +555,9 @@ public final class OrderElementConverter { if (orderElementDTO instanceof OrderLineDTO) { if (!(orderElement instanceof OrderLine)) { throw new ValidationException(_( - "Task {0} : Task group is incompatible type with {1}" - + orderElement.getCode(), orderElement - .getClass().getName())); + "Task {0}: Task group is incompatible type with {1}", + orderElement.getCode(), orderElement.getClass() + .getName())); } if (configuration.isHoursGroups()) { @@ -578,9 +578,9 @@ public final class OrderElementConverter { if (orderElementDTO instanceof OrderDTO) { if (!(orderElement instanceof Order)) { throw new ValidationException(_( - "Task {0} : Project is incompatible type with {1}" - + orderElement.getCode(), orderElement - .getClass().getName())); + "Task {0}: Project is incompatible type with {1}", + orderElement.getCode(), orderElement.getClass() + .getName())); } Order order = (Order) orderElement; @@ -610,10 +610,10 @@ public final class OrderElementConverter { } } else { // orderElementDTO instanceof OrderLineGroupDTO if (!(orderElement instanceof OrderLineGroup)) { - throw new ValidationException(_( - "Task {0} : Task group is incompatible type with {1}" - + orderElement.getCode(), orderElement - .getClass().getName())); + throw new ValidationException( + _("Task {0}: Task group is incompatible type with {1}", + orderElement.getCode(), orderElement + .getClass().getName())); } } @@ -623,14 +623,14 @@ public final class OrderElementConverter { childDTO, configuration); } else { if (checkConstraintUniqueOrderCode(orderElementDTO)) { - throw new ValidationException( - _("Task {0} : Duplicate code in DB" - + orderElementDTO.code)); + throw new ValidationException(_( + "Task {0}: Duplicate code in DB", + orderElementDTO.code)); } if (checkConstraintUniqueHoursGroupCode(orderElementDTO)) { - throw new ValidationException( - _("Hours Group {0} : Duplicate code in DB" - + orderElementDTO.code)); + throw new ValidationException(_( + "Hours Group {0}: Duplicate code in DB", + orderElementDTO.code)); } ((OrderLineGroup) orderElement).add(toEntity(childDTO, configuration));