From fa21d3e444be8f560a3369abf756fd9c8f0f05f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 22 Jun 2010 10:10:15 +0200 Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #529] Fix bug by reverting the commit that introduced it. Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497] Resources are reloaded in order to show the load chart." This reverts commit 75017c9fe89fb41da91c77339f033a300db41ee5. Conflicts: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java --- .../web/planner/order/OrderPlanningModel.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 3d385d9bb..f1959b4de 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -1178,7 +1178,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { SortedMap> orderDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(orderDayAssignments); List resourcesDayAssignments = new ArrayList(); - for (Resource resource : reloadResources(order.getResources())) { + for (Resource resource : order.getResources()) { resourcesDayAssignments.addAll(assigmentsOnResourceCalculator .getAssignments(resource)); } @@ -1232,17 +1232,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { chart.setHeight("150px"); } - private List reloadResources( - Collection resources) { - List result = new ArrayList(); - for (Resource each : resources) { - Resource reloaded = resourceDAO - .findExistingEntity(each.getId()); - result.add(reloaded); - } - return result; - } - private void resetMaps() { mapOrderLoad.clear(); mapOrderOverload.clear();