From 30bcdb257358a6d6e8bd036a5ab70b342c175e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 15 Sep 2010 18:41:22 +0200
Subject: [PATCH] Inline getTaskCalendar method

FEA: ItEr60S19TimeUnitDataType
---
 .../planner/entities/ResourceAllocation.java      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 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 f59947425..a19b59b30 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
@@ -592,9 +592,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
 
         private AvailabilityTimeLine getAvailability() {
             AvailabilityTimeLine resourcesAvailability = getResourcesAvailability();
-            if (getTaskCalendar() != null) {
-                return getTaskCalendar().getAvailability().and(
-                        resourcesAvailability);
+            BaseCalendar taskCalendar = getTask().getCalendar();
+            if (taskCalendar != null) {
+                return taskCalendar.getAvailability()
+                        .and(resourcesAvailability);
             } else {
                 return resourcesAvailability;
             }
@@ -754,20 +755,16 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
     }
 
     private IWorkHours getTaskWorkHours() {
-        if (getTaskCalendar() == null) {
+        if (getTask().getCalendar() == null) {
             return SameWorkHoursEveryDay.getDefaultWorkingDay();
         } else {
-            return getTaskCalendar();
+            return getTask().getCalendar();
         }
     }
 
     protected abstract IWorkHours getWorkHoursGivenTaskHours(
             IWorkHours taskWorkHours);
 
-    protected final BaseCalendar getTaskCalendar() {
-        return getTask().getCalendar();
-    }
-
     private void resetGenericAssignmentsTo(List<DayAssignment> assignments) {
         resetAssignmentsTo(cast(assignments));
     }