From 6da7f3113a756a95716f1e1406f2d8351ba1fa44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 5 Mar 2010 21:11:41 +0100 Subject: [PATCH] ItEr49S18AdaptacionServiciosREST: Changed CriterionDTO to create its inner Criterion object as soon as possible. It's needed for the code to be generated from the first moment so we can show it for new Criteria. --- .../web/resources/criterion/CriterionTreeModel.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java index 56c85ca03..c674eb2ac 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java @@ -119,6 +119,8 @@ public class CriterionTreeModel implements ICriterionTreeModel{ private CriterionDTO createNewCriterion(String name) { CriterionDTO newCriterion = new CriterionDTO(); newCriterion.setName(_(name)); + Criterion criterion = Criterion.create(criterionType); + newCriterion.setCriterion(criterion); return newCriterion; } @@ -409,10 +411,6 @@ public class CriterionTreeModel implements ICriterionTreeModel{ private void updateDataCriterion(CriterionDTO criterionDTO){ Criterion criterion = criterionDTO.getCriterion(); - if(criterion == null){ - criterion = Criterion.create(criterionType); - criterionDTO.setCriterion(criterion); - } criterion.setName(criterionDTO.getName()); criterion.setActive(criterionDTO.isActive()); }