From 97e2c721d7efe972b18a50c5304fda8a0be634b9 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 20 Dec 2011 18:00:14 +0100
Subject: [PATCH] Fix problem with consolidation and specific assignments

FEA: ItEr75S04BugFixing
---
 .../consolidations/AdvanceConsolidationModel.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
index 384615788..6adaf1564 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
@@ -41,7 +41,6 @@ import org.libreplan.business.planner.daos.ITaskElementDAO;
 import org.libreplan.business.planner.entities.ResourceAllocation;
 import org.libreplan.business.planner.entities.ResourceAllocation.AllocationsSpecified;
 import org.libreplan.business.planner.entities.ResourceAllocation.DetachDayAssignmentOnRemoval;
-import org.libreplan.business.planner.entities.SpecificResourceAllocation;
 import org.libreplan.business.planner.entities.Task;
 import org.libreplan.business.planner.entities.TaskElement;
 import org.libreplan.business.planner.entities.consolidations.CalculatedConsolidatedValue;
@@ -250,15 +249,8 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
 
     private void reassign(ResourceAllocation<?> resourceAllocation,
             IntraDayDate end, EffortDuration pendingEffort) {
-        if (resourceAllocation instanceof SpecificResourceAllocation) {
-            ((SpecificResourceAllocation) resourceAllocation)
-                    .allocateWholeAllocationKeepingProportions(pendingEffort,
-                            end);
-        } else {
-            resourceAllocation.withPreviousAssociatedResources()
-                    .fromStartUntil(end)
-                    .allocate(pendingEffort);
-        }
+        resourceAllocation.withPreviousAssociatedResources()
+                .fromStartUntil(end).allocate(pendingEffort);
     }
 
     private void reassignExpandingTask(