From 1cf2283f42b5dda10858668462bf3a2f65de99f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 19 Oct 2009 23:49:33 +0200 Subject: [PATCH] ItEr31S12ValidacionEProbasFuncionaisItEr30S17: Moving and making public method so it can be reused. --- .../ResourceAllocationWithDesiredResourcesPerDay.java | 9 +++++++++ .../allocation/ResourceAllocationsBeingEdited.java | 11 +---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java index 74a1fa322..c94ab7cf4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/ResourceAllocationWithDesiredResourcesPerDay.java @@ -61,4 +61,13 @@ public class ResourceAllocationWithDesiredResourcesPerDay { public ResourcesPerDay getResourcesPerDay() { return resourcesPerDay; } + + public static List> stripResourcesPerDay( + List withResourcesPerDay) { + List> result = new ArrayList>(); + for (ResourceAllocationWithDesiredResourcesPerDay r : withResourcesPerDay) { + result.add(r.getResourceAllocation()); + } + return result; + } } \ No newline at end of file diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java index 9466a899d..3809d41ec 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java @@ -202,7 +202,7 @@ public class ResourceAllocationsBeingEdited { } return new AllocationResult(task, calculatedValue, new AggregateOfResourceAllocations( - stripResourcesPerDay(allocations)), daysDuration, + ResourceAllocationWithDesiredResourcesPerDay.stripResourcesPerDay(allocations)), daysDuration, fromDetachedToAttached); } @@ -241,15 +241,6 @@ public class ResourceAllocationsBeingEdited { return Days.daysBetween(start, end).getDays(); } - private List> stripResourcesPerDay( - List withResourcesPerDay) { - List> result = new ArrayList>(); - for (ResourceAllocationWithDesiredResourcesPerDay r : withResourcesPerDay) { - result.add(r.getResourceAllocation()); - } - return result; - } - private ResourceAllocation createAllocation(AllocationDTO allocation) { if (allocation instanceof SpecificAllocationDTO) { SpecificAllocationDTO specific = (SpecificAllocationDTO) allocation;