From 9b73598c653df8dc130c42fdbbd1ca5e79018003 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 11 May 2012 12:26:31 +0200 Subject: [PATCH] Bug #1428: Rename customAssignedEffortForResource to setAssignedEffortForResource FEA: ItEr76S04BugFixing --- .../business/planner/entities/GenericResourceAllocation.java | 2 +- .../main/java/org/libreplan/business/planner/entities/Task.java | 2 +- .../org/libreplan/web/planner/allocation/AllocationRow.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java index 34929c7a5..6094ef6db 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/GenericResourceAllocation.java @@ -240,7 +240,7 @@ public class GenericResourceAllocation extends private IAssignedEffortForResource assignedEffortForResource = null; - public void customAssignedEffortForResource( + public void setAssignedEffortForResource( IAssignedEffortForResource assignedEffortForResource) { this.assignedEffortForResource = assignedEffortForResource; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java index eca2743c3..a2ee164c5 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/Task.java @@ -779,7 +779,7 @@ public class Task extends TaskElement implements ITaskPositionConstrained { List generic = ResourceAllocation.getOfType( GenericResourceAllocation.class, beingModified); for (GenericResourceAllocation each : generic) { - each.customAssignedEffortForResource(AssignedEffortForResource.sum( + each.setAssignedEffortForResource(AssignedEffortForResource.sum( allNewLoad.withoutConsidering(each), discounting)); } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java index 9e4d00b06..58b298ba4 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/allocation/AllocationRow.java @@ -216,7 +216,7 @@ public abstract class AllocationRow { for (GenericResourceAllocation each : ResourceAllocation.getOfType(GenericResourceAllocation.class, beingModified)) { IAssignedEffortForResource custom = AssignedEffortForResource.sum( withTheLoadOf.withoutConsidering(each), effortForResource); - each.customAssignedEffortForResource(custom); + each.setAssignedEffortForResource(custom); } }