From febb379777ebebf437d94336240f10d68fbb4109 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 22 Jun 2010 10:49:28 +0200
Subject: [PATCH]  ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #536]

it deletes the repeated criteria, when the resources load are
grouped by criteria.
---
 .../navalplanner/web/resourceload/ResourceLoadModel.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
index 1d57f9727..bb44e049e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
@@ -248,7 +248,11 @@ public class ResourceLoadModel implements IResourceLoadModel {
                 List<ResourceAllocation<?>> listAllocations = new ArrayList<ResourceAllocation<?>>(
                         task.getSatisfiedResourceAllocations());
                 for (GenericResourceAllocation generic : (onlyGeneric(listAllocations))) {
-                    allCriteriaList.addAll(generic.getCriterions());
+                    for (Criterion criterion : generic.getCriterions()) {
+                        if (!allCriteriaList.contains(criterion)) {
+                            allCriteriaList.add(criterion);
+                        }
+                    }
                 }
             }
             allCriteriaList = Criterion.sortByTypeAndName(allCriteriaList);