From f02f541dd0d5caaeb7397819bfcb52077c6d504e Mon Sep 17 00:00:00 2001 From: Diego Pino Garcia Date: Tue, 3 May 2011 11:36:50 +0200 Subject: [PATCH] Renamed variables to fit better name FEA: ItEr74S04BugFixing --- .../planner/entities/StretchesFunctionTypeEnum.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunctionTypeEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunctionTypeEnum.java index e8d50ad55..950a5d52b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunctionTypeEnum.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunctionTypeEnum.java @@ -59,6 +59,7 @@ public enum StretchesFunctionTypeEnum { List intervalsDefinedByStreches, LocalDate startInclusive, LocalDate endExclusive, int totalHours) { + double[] x = Interval.getDayPointsFor(startInclusive, intervalsDefinedByStreches); assert x.length == 1 + intervalsDefinedByStreches.size(); @@ -178,10 +179,10 @@ public enum StretchesFunctionTypeEnum { List intervals = new ArrayList(); intervals.addAll(stretchesFunction.getIntervalsDefinedByStreches()); - LocalDate start = resourceAllocation.getFirstNonConsolidatedDate(); - LocalDate end = resourceAllocation.getTask().getEndAsLocalDate(); + LocalDate startInclusive = resourceAllocation.getFirstNonConsolidatedDate(); + LocalDate endExclusive = resourceAllocation.getTask().getEndAsLocalDate(); int totalHours = resourceAllocation.getNonConsolidatedHours(); - apply(resourceAllocation, intervals, start, end, totalHours); + apply(resourceAllocation, intervals, startInclusive, endExclusive, totalHours); } protected abstract void apply(ResourceAllocation allocation,