From 6b54cc723a809b33b2652ce8a8c931084b95b2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Thu, 17 Sep 2009 13:22:05 +0200 Subject: [PATCH] ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Fixing. It must use the resource calendar when sharing out. --- .../planner/entities/GenericResourceAllocation.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index 6bd59d584..ba704f92a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Set; import org.joda.time.LocalDate; -import org.navalplanner.business.calendars.entities.BaseCalendar; -import org.navalplanner.business.calendars.entities.CombinedWorkHours; import org.navalplanner.business.calendars.entities.IWorkHours; import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay; import org.navalplanner.business.resources.entities.Criterion; @@ -100,16 +98,8 @@ public class GenericResourceAllocation extends ResourceAllocation { } private final IWorkHours generateWorkHoursFor(Resource resource) { - List calendars = new ArrayList(); if (resource.getCalendar() != null) { - calendars.add(resource.getCalendar()); - } - if (getTaskCalendar() != null) { - calendars.add(getTaskCalendar()); - } - if (!calendars.isEmpty()) { - return CombinedWorkHours.minOf(calendars - .toArray(new IWorkHours[0])); + return resource.getCalendar(); } else { return SameWorkHoursEveryDay.getDefaultWorkingDay(); }