From 5472ba7ac4e683583e47f8972b84bea8c8e99950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 3 Sep 2010 18:22:05 +0200 Subject: [PATCH] Rename to less confusing name FEA: ItEr60S19TimeUnitDataType --- .../org/navalplanner/web/planner/chart/ChartFiller.java | 6 +++--- .../web/planner/company/CompanyPlanningModel.java | 2 +- .../navalplanner/web/planner/order/OrderPlanningModel.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java index 025159395..cf1e5ab7e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java @@ -158,16 +158,16 @@ public abstract class ChartFiller implements IChartFiller { return sum; } - protected static EffortDuration sumAvailabilitiesForDay( + protected static EffortDuration sumCalendarCapacitiesForDay( Collection resources, LocalDate day) { EffortDuration sum = zero(); for (Resource resource : resources) { - sum = sum.plus(availabilityFor(resource, day)); + sum = sum.plus(calendarCapacityFor(resource, day)); } return sum; } - protected static EffortDuration availabilityFor(Resource resource, + protected static EffortDuration calendarCapacityFor(Resource resource, LocalDate day) { return resource.getCalendarOrDefault().getCapacityDurationAt(day); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index 03e3894c1..a9d043244 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -948,7 +948,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { Entry> element) { LocalDate day = element.getKey(); List resources = element.getValue(); - return sumAvailabilitiesForDay(resources, day); + return sumCalendarCapacitiesForDay(resources, day); } }.calculate(getResourcesByDateBetween(resources, start, finish)); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 723550cdd..1f15e4567 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -1250,7 +1250,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { for (Resource resource : orderDayAssignmentsGrouped.get(day) .keySet()) { - final EffortDuration resourceCapacityHours = availabilityFor( + final EffortDuration resourceCapacityHours = calendarCapacityFor( resource, day); final EffortDuration durationAtOrder = orderDayAssignmentsGrouped @@ -1303,7 +1303,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { EffortDuration result = zero(); for (Resource resource : orderDayAssignmentsGrouped.get(day) .keySet()) { - result = result.plus(availabilityFor(resource, day)); + result = result.plus(calendarCapacityFor(resource, day)); } return result; }