From 10ffaf13863d53b668750cdcb0732ae355ce8767 Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 21 Jun 2011 09:48:08 +0200 Subject: [PATCH] shows the validation messages and constraint messages. FEA: ItEr75S05CalendarAdminInterfaceItEr74S06 --- .../business/calendars/entities/BaseCalendar.java | 7 ++++--- .../web/calendars/BaseCalendarEditionController.java | 7 ++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index 4c20a8221..76c63510a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -448,7 +448,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { } } else { throw new IllegalArgumentException( - "the new version will be the first one, and the start date must be empty"); + "Wrong start date : the new version will be the first one, and the start date must be empty"); } } } @@ -480,7 +480,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { if ((calendarData.getExpiringDate() != null) && (startDate.compareTo(calendarData.getExpiringDate()) <= 0)) { throw new IllegalArgumentException( - "Version date must be greater than expiring date of " + "Wrong start date : Version date must be greater than expiring date of " + "all versions of this calendar"); } @@ -498,8 +498,9 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { CalendarData firstVersion = getFirstCalendarData(); if ((firstVersion.getExpiringDate() != null) && (expiringDate.compareTo(firstVersion.getExpiringDate()) >= 0)) { + throw new IllegalArgumentException( - "Version expiring date must be lower than expiring date of " + "Wrong expiring date : Version expiring date must be lower than expiring date of " + "all versions of this calendar"); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index d6a456dcc..4c799c578 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -957,7 +957,12 @@ public abstract class BaseCalendarEditionController extends baseCalendarModel.createNewVersion(startDate, expiringDate, selected); } catch (IllegalArgumentException e) { - throw new WrongValueException(compStartDate, e.getMessage()); + if (e.getMessage().contains("Wrong expiring date")) { + throw new WrongValueException(compExpiringDate, _(e + .getMessage())); + } else { + throw new WrongValueException(compStartDate, _(e.getMessage())); + } } Clients.closeErrorBox(compStartDate);