From 52793e81aef2b19bbcd334e7d1f6793fe171ceeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Fri, 4 Dec 2009 00:13:49 +0100
Subject: [PATCH] ItEr37S08CUCreacionUnidadesPlanificacionItEr36S11:
 addDefaultAllocations now returns a ProportionalDistributor

---
 .../planner/allocation/IResourceAllocationModel.java  |  3 ++-
 .../planner/allocation/ResourceAllocationModel.java   | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
index 3a716ebca..836166158 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IResourceAllocationModel.java
@@ -22,6 +22,7 @@ package org.navalplanner.web.planner.allocation;
 
 import java.util.List;
 
+import org.navalplanner.business.common.ProportionalDistributor;
 import org.navalplanner.business.orders.entities.AggregatedHoursGroup;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.web.planner.order.PlanningState;
@@ -67,6 +68,6 @@ public interface IResourceAllocationModel extends INewAllocationsAdder {
     <T> T onAllocationContext(
             IResourceAllocationContext<T> resourceAllocationContext);
 
-    void addDefaultAllocations();
+    ProportionalDistributor addDefaultAllocations();
 
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
index 5c7168871..a9044f6ea 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
@@ -28,6 +28,7 @@ import java.util.Set;
 
 import org.hibernate.Hibernate;
 import org.navalplanner.business.calendars.daos.IBaseCalendarDAO;
+import org.navalplanner.business.common.ProportionalDistributor;
 import org.navalplanner.business.orders.daos.IHoursGroupDAO;
 import org.navalplanner.business.orders.entities.AggregatedHoursGroup;
 import org.navalplanner.business.orders.entities.HoursGroup;
@@ -103,14 +104,20 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
 
     @Override
     @Transactional(readOnly = true)
-    public void addDefaultAllocations() {
+    public ProportionalDistributor addDefaultAllocations() {
         reassociateResourcesWithSession();
-        for (AggregatedHoursGroup each : task.getAggregatedByCriterions()) {
+        List<AggregatedHoursGroup> hoursGroups = task
+                .getAggregatedByCriterions();
+        int hours[] = new int[hoursGroups.size()];
+        int i = 0;
+        for (AggregatedHoursGroup each : hoursGroups) {
+            hours[i++] = each.getHours();
             List<Resource> resourcesFound = resourceDAO
                     .findAllSatisfyingCriterions(each.getCriterions());
             allocationRowsHandler.addGeneric(each.getCriterions(),
                     reloadResources(resourcesFound));
         }
+        return ProportionalDistributor.create(hours);
     }
 
     @Override