From ad08434ea347f395062ac5857200cecf2ece24ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 15 Sep 2010 18:38:08 +0200 Subject: [PATCH] Remove unnecessary indirection FEA: ItEr60S19TimeUnitDataType --- .../planner/entities/ResourceAllocation.java | 39 +++---------------- 1 file changed, 5 insertions(+), 34 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 7931fcae4..f59947425 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -47,7 +47,6 @@ 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.calendars.entities.ThereAreHoursOnWorkHoursCalculator; import org.navalplanner.business.common.BaseEntity; import org.navalplanner.business.common.Registry; import org.navalplanner.business.planner.entities.DerivedAllocationGenerator.IWorkerFinder; @@ -755,39 +754,11 @@ public abstract class ResourceAllocation extends } private IWorkHours getTaskWorkHours() { - return new IWorkHours() { - - @Override - public EffortDuration getCapacityDurationAt(LocalDate date) { - return getSubyacent().getCapacityDurationAt(date); - } - - private IWorkHours getSubyacent() { - if (getTaskCalendar() == null) { - return SameWorkHoursEveryDay.getDefaultWorkingDay(); - } else { - return getTaskCalendar(); - } - } - - @Override - public EffortDuration asDurationOn(LocalDate day, - ResourcesPerDay amount) { - return getSubyacent().asDurationOn(day, amount); - } - - @Override - public boolean thereAreCapacityFor(AvailabilityTimeLine availability, - ResourcesPerDay resourcesPerDay, EffortDuration durationToAllocate) { - return ThereAreHoursOnWorkHoursCalculator.thereIsAvailableCapacityFor(this, - availability, resourcesPerDay, durationToAllocate); - } - - @Override - public AvailabilityTimeLine getAvailability() { - return getSubyacent().getAvailability(); - } - }; + if (getTaskCalendar() == null) { + return SameWorkHoursEveryDay.getDefaultWorkingDay(); + } else { + return getTaskCalendar(); + } } protected abstract IWorkHours getWorkHoursGivenTaskHours(