From 6ba095ac4753708671a25ab02efc9bf6aab6b07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 8 Dec 2009 00:01:15 +0100 Subject: [PATCH] ItEr38S05ValidacionEProbasFuncionaisItEr37S06: [Bug #118] Fixed. Now it only complains if there is another advance type with the same name --- .../navalplanner/web/advance/AdvanceTypeCRUDController.java | 4 ++-- .../java/org/navalplanner/web/advance/AdvanceTypeModel.java | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java index 013606090..985783baf 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java @@ -149,9 +149,9 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer { throw new WrongValueException(comp, _("The name is not valid, the name must not be null ")); } - if (!(advanceTypeModel.distinctNames((String) value))) { + if (!advanceTypeModel.distinctNames((String) value)) { throw new WrongValueException(comp, - _("The name is not valid, there is another advance type with a similar name. ")); + _("The name is not valid, there is another advance type with the same name. ")); } } }; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java index 7bb6a13fe..a8a9182a8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java @@ -136,10 +136,8 @@ public class AdvanceTypeModel implements IAdvanceTypeModel { } for (AdvanceType advanceType : advanceTypeDAO .list(AdvanceType.class)) { - if ((advanceType.getId() == null) - || (!advanceType.getId().equals(this.advanceType.getId())) - && (advanceType.getUnitName().contains(name) || (name - .contains(advanceType.getUnitName())))) { + if (!advanceType.getId().equals(this.advanceType.getId()) + && advanceType.getUnitName().equalsIgnoreCase(name)) { return false; } }