From e1f1e2f08345b418cf31101c48dfaea9ccea32b4 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 19 Oct 2011 12:29:38 +0200
Subject: [PATCH] [Bug #1217] Fix issue avoiding reattach of criteria

We don't need to reattach criteria in ResourceAllocationModel, as
they're already loaded in PlanningStateCreator.

FEA: ItEr75S04BugFixing
---
 .../web/planner/allocation/ResourceAllocationModel.java   | 8 --------
 1 file changed, 8 deletions(-)

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 d9b72c580..3c4cbdf8a 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
@@ -266,7 +266,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
         reattachTaskSource();
         loadCriterionsOfGenericAllocations();
         reattachHoursGroup(this.task.getHoursGroup());
-        reattachCriterions(this.task.getHoursGroup().getValidCriterions());
         loadResources(this.task.getSatisfiedResourceAllocations());
         loadDerivedAllocations(this.task.getSatisfiedResourceAllocations());
         List<AllocationRow> initialRows = AllocationRow.toRows(
@@ -307,13 +306,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
     private void reattachHoursGroup(HoursGroup hoursGroup) {
         hoursGroupDAO.reattachUnmodifiedEntity(hoursGroup);
         hoursGroup.getPercentage();
-        reattachCriterions(hoursGroup.getValidCriterions());
-    }
-
-    private void reattachCriterions(Set<Criterion> criterions) {
-        for (Criterion criterion : criterions) {
-            reattachCriterion(criterion);
-        }
     }
 
     private void loadResources(Set<ResourceAllocation<?>> resourceAllocations) {