From 6fbbe3c30fbdf63dec383de74e36ae7c835c2b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 22 Feb 2011 18:58:38 +0100 Subject: [PATCH] Rename local variables so it's easier to understand FEA: ItEr71S07FragmentationDeletionItEr70S09 --- .../business/calendars/entities/BaseCalendar.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 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 67ee89939..dd5a86db2 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 @@ -763,11 +763,13 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar { @Override public EffortDuration asDurationOn(PartialDay day, ResourcesPerDay amount) { Capacity capacity = findCapacityAt(day.getDate()); - EffortDuration workableDuration = day.limitDuration(capacity - .getStandardEffort()); - EffortDuration asDuration = amount - .asDurationGivenWorkingDayOf(workableDuration); - return multiplyByCalendarUnits(capacity).limitDuration(asDuration); + EffortDuration oneResourcePerDayWorkingDuration = day + .limitDuration(capacity.getStandardEffort()); + EffortDuration amountRequestedDuration = amount + .asDurationGivenWorkingDayOf(oneResourcePerDayWorkingDuration); + + return multiplyByCalendarUnits(capacity).limitDuration( + amountRequestedDuration); } /**