From 6ce60c81f4af1e9a74f93d983d3c91fbd9ee6eb3 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Tue, 6 Jul 2010 15:08:42 +0200
Subject: [PATCH]  ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : Fixing bug
 in the unit type class.

it shows the error messages when the importation is incorrect.
---
 .../business/materials/entities/UnitType.java          |  4 ++++
 scripts/rest-clients/unit-types-sample.xml             | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/UnitType.java b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/UnitType.java
index 908ee7619..139406861 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/UnitType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/materials/entities/UnitType.java
@@ -92,6 +92,10 @@ public class UnitType extends IntegrationEntity{
 
     @AssertTrue(message = "the measure unit type has to be unique. It is already used")
     public boolean checkConstraintUniqueName() {
+        if (StringUtils.isBlank(measure)) {
+            return true;
+        }
+
         boolean result;
         if (isNewObject()) {
             result = !existsUnitTypeWithTheName();
diff --git a/scripts/rest-clients/unit-types-sample.xml b/scripts/rest-clients/unit-types-sample.xml
index 8d35bfc4b..30c4b93a9 100644
--- a/scripts/rest-clients/unit-types-sample.xml
+++ b/scripts/rest-clients/unit-types-sample.xml
@@ -8,4 +8,14 @@
   <unit-type measure="m2" code="000-006" />
   <unit-type measure="m3" code="000-007" />
   <unit-type measure="tn" code="000-008" />
+
+<!-- code repeated -->
+  <unit-type measure="m1" code="000-001" />
+<!-- without code  -->
+  <unit-type measure="m2" />
+<!-- measure repeated -->
+  <unit-type measure="units" code="000-009" />
+<!-- without measure  -->
+  <unit-type code="000-010" />
+
 </unit-type-list>