From e2f48c5e72b314ea585632525aa95dca51e79c48 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Wed, 16 Feb 2011 17:44:17 +0100
Subject: [PATCH] [Bug #857] Fix bug

reattach the satisfied criteria and its criterion
type of the machine to edit, if it is necessary.

FEA : ItEr70S04BugFixing
---
 .../machine/AssignedMachineCriterionsModel.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
index 61de4f8ec..3f3a34a6d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
@@ -120,14 +120,17 @@ public class AssignedMachineCriterionsModel extends IntegrationEntityModel
 
     private void initializeCriterionSatisfactions(
             Set<CriterionSatisfaction> criterionsSatisfaction) {
+        Set<CriterionType> types = new HashSet<CriterionType>();
         for (CriterionSatisfaction criterionSatisfaction : criterionsSatisfaction) {
-            initializeCriterionSatisfaction(criterionSatisfaction);
-        }
-    }
+            Criterion criterion = criterionSatisfaction.getCriterion();
+            initializeCriterion(criterion);
 
-    private void initializeCriterionSatisfaction(
-            CriterionSatisfaction criterionSatisfaction) {
-        initializeCriterion(criterionSatisfaction.getCriterion());
+            if (!types.contains(criterionSatisfaction.getCriterion().getType())) {
+                types.add(criterionSatisfaction.getCriterion().getType());
+                reattachCriterionType(criterionSatisfaction.getCriterion()
+                    .getType());
+            }
+        }
     }
 
     private void initializeCriterion(Criterion criterion) {
@@ -136,7 +139,6 @@ public class AssignedMachineCriterionsModel extends IntegrationEntityModel
         if (criterion.getParent() != null) {
             criterion.getParent().getName();
         }
-        reattachCriterionType(criterion.getType());
     }
 
     private void reattachCriterionType(CriterionType criterionType) {