From 4f14ed929203b1016027576cc9d3cbbf15c67bca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Fri, 9 Jul 2010 19:16:31 +0200
Subject: [PATCH]  ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #554]
 Fix bug.

Replaces the usual calculation of ResourcesPerDay (based on DayAssignments)
for a plain assignation to 1.
---
 .../business/planner/entities/GenericResourceAllocation.java  | 2 +-
 .../business/planner/entities/ResourceAllocation.java         | 4 ++++
 .../business/planner/entities/SpecificResourceAllocation.java | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
index 2ed67a9fe..7e5e49cb3 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
@@ -132,7 +132,7 @@ public class GenericResourceAllocation extends
             Collection<? extends Criterion> criterions) {
         GenericResourceAllocation result = new GenericResourceAllocation(task);
         result.criterions = new HashSet<Criterion>(criterions);
-        result.updateResourcesPerDay();
+        result.setResourcesPerDayToAmount(1);
         return create(result);
     }
 
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 6ea06efc6..02951d230 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
@@ -384,6 +384,10 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         }
     }
 
+    protected void setResourcesPerDayToAmount(int amount) {
+        this.resourcesPerDay = ResourcesPerDay.amount(amount);
+    }
+
     public ResourceAllocation(Task task) {
         this(task, null);
     }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
index 823deb94d..6122518d1 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
@@ -78,7 +78,7 @@ public class SpecificResourceAllocation extends
         SpecificResourceAllocation result = create(new SpecificResourceAllocation(
                 task));
         result.setResource(resource);
-        result.updateResourcesPerDay();
+        result.setResourcesPerDayToAmount(1);
         return result;
     }