From 75c1110d1d36b22003fad903f9cec3efe6dfe5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 2 Sep 2010 20:05:11 +0200 Subject: [PATCH] Expose method that always returns a not null IWorkHours for a resource FEA: ItEr60S19TimeUnitDataType --- .../navalplanner/business/resources/entities/Resource.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index a61232dc8..26ea269a5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -865,15 +865,16 @@ public abstract class Resource extends IntegrationEntity { } public int getTotalWorkHours(LocalDate start, LocalDate end) { - return getTotalWorkHoursFor(calendarOrDefault(), start, end, null); + return getTotalWorkHoursFor(getCalendarOrDefault(), start, end, null); } public int getTotalWorkHours(LocalDate start, LocalDate end, ICriterion criterion) { - return getTotalWorkHoursFor(calendarOrDefault(), start, end, criterion); + return getTotalWorkHoursFor(getCalendarOrDefault(), start, end, + criterion); } - private IWorkHours calendarOrDefault() { + public IWorkHours getCalendarOrDefault() { return getCalendar() != null ? getCalendar() : SameWorkHoursEveryDay .getDefaultWorkingDay(); }