From 84525951d3081b9d711fbd05d02909955642fe9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 6 Sep 2010 11:57:10 +0200 Subject: [PATCH] Remove deprecated methods on BaseCalendar FEA: ItEr60S19TimeUnitDataType --- .../business/calendars/entities/BaseCalendar.java | 6 ++---- 1 file changed, 2 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 b4644027e..ca3167976 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 @@ -534,11 +534,9 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours { } return DayType.ANCESTOR_EXCEPTION; } - - if (getCapacityAt(date) == 0) { + if (getCapacityDurationAt(date).isZero()) { return DayType.ZERO_HOURS; } - return DayType.NORMAL; } @@ -739,7 +737,7 @@ public class BaseCalendar extends IntegrationEntity implements IWorkHours { Set result = new HashSet(); for (LocalDate current = init; current.compareTo(end) <= 0; current = current .plusDays(1)) { - if (getCapacityAt(current) == 0) { + if (getCapacityDurationAt(current).isZero()) { result.add(current); } }