From 781f6f83c2b854307155c886254a957c54c081a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 19 Jan 2011 13:10:01 +0100
Subject: [PATCH] Make consufing method private

FEA: ItEr68OTS05IntroducionLimiteSobreasignacionCalendarios
---
 .../business/calendars/entities/BaseCalendar.java             | 2 +-
 .../org/navalplanner/web/calendars/BaseCalendarModel.java     | 4 +++-
 .../java/org/navalplanner/web/montecarlo/MonteCarloTask.java  | 4 +++-
 3 files changed, 7 insertions(+), 3 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 145c0b216..bafe9f84f 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
@@ -266,7 +266,7 @@ public class BaseCalendar extends IntegrationEntity implements ICalendar {
         return date.limitDuration(getWorkableTimeAt(date.getDate()));
     }
 
-    public EffortDuration getWorkableTimeAt(LocalDate date) {
+    private EffortDuration getWorkableTimeAt(LocalDate date) {
         if (!isActive(date)) {
             return EffortDuration.zero();
         }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
index 66e87b906..0cec36500 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarModel.java
@@ -49,6 +49,7 @@ import org.navalplanner.business.common.entities.EntityNameEnum;
 import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.workingday.EffortDuration;
+import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
 import org.navalplanner.web.common.IntegrationEntityModel;
 import org.navalplanner.web.common.concurrentdetection.OnConcurrentModification;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -258,7 +259,8 @@ public class BaseCalendarModel extends IntegrationEntityModel implements
         if (getBaseCalendar() == null) {
             return null;
         }
-        return getBaseCalendar().getWorkableTimeAt(selectedDate);
+        return getBaseCalendar().getCapacityOn(
+                PartialDay.wholeDay(selectedDate));
     }
 
     @Override
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloTask.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloTask.java
index 3fb374b87..ab0140d51 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloTask.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloTask.java
@@ -28,6 +28,7 @@ import org.joda.time.LocalDate;
 import org.navalplanner.business.calendars.entities.BaseCalendar;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.workingday.EffortDuration;
+import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
 
 /**
  *
@@ -59,7 +60,8 @@ public class MonteCarloTask {
 
         double duration = daysDuration.doubleValue();
         for (int i = 0; i < duration;) {
-            EffortDuration workableTime = calendar.getWorkableTimeAt(day);
+            EffortDuration workableTime = calendar.getCapacityOn(PartialDay
+                    .wholeDay(day));
             if (!EffortDuration.zero().equals(workableTime)) {
                 i++;
             }