From d795fe62706a289c92a0d115853ff6bc8215babd Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Fri, 23 Apr 2010 21:21:15 +0200
Subject: [PATCH]  ItEr55S07AdaptacionServiciosRESTItEr54S09: Using a more
 human friendly code for CalendarExceptionType predefined entities.

---
 .../calendars/entities/CalendarExceptionType.java    |  6 ++++++
 .../entities/PredefinedCalendarExceptionTypes.java   |  3 ++-
 scripts/rest-clients/calendars-sample.xml            | 12 ++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
index f6cf68320..ed3ce782e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/CalendarExceptionType.java
@@ -37,6 +37,12 @@ public class CalendarExceptionType extends IntegrationEntity {
         return create(new CalendarExceptionType(name, color, notAssignable));
     }
 
+    public static CalendarExceptionType create(String code, String name,
+            String color, Boolean notAssignable) {
+        return create(new CalendarExceptionType(name, color, notAssignable),
+                code);
+    }
+
     private String name;
     private String color;
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/PredefinedCalendarExceptionTypes.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/PredefinedCalendarExceptionTypes.java
index bc1e59ca7..36375c261 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/PredefinedCalendarExceptionTypes.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/PredefinedCalendarExceptionTypes.java
@@ -37,7 +37,8 @@ public enum PredefinedCalendarExceptionTypes {
 
     private PredefinedCalendarExceptionTypes(String name, String color,
             Boolean notAssignable) {
-        calendarExceptionType = CalendarExceptionType.create(name, color,
+        // Using the name as code in order to be more human friendly
+        calendarExceptionType = CalendarExceptionType.create(name, name, color,
                 notAssignable);
     }
 
diff --git a/scripts/rest-clients/calendars-sample.xml b/scripts/rest-clients/calendars-sample.xml
index c2494a1d0..85bfcb83c 100644
--- a/scripts/rest-clients/calendars-sample.xml
+++ b/scripts/rest-clients/calendars-sample.xml
@@ -3,10 +3,10 @@
 <base-calendar parent="000-000" name="Spain Calendar"
   code="000-001">
     <calendar-exception-list>
-      <calendar-exception calendar-exception-type-code="holiday-001"
+      <calendar-exception calendar-exception-type-code="HOLIDAY"
       hours="8" date="2010-04-07"
       code="000-004" />
-      <calendar-exception calendar-exception-type-code="holiday-001"
+      <calendar-exception calendar-exception-type-code="HOLIDAY"
       hours="7" date="2010-04-12"
       code="000-005" />
     </calendar-exception-list>
@@ -25,16 +25,16 @@
   name="Galician Calendar"
   code="000-001">
     <calendar-exception-list>
-      <calendar-exception calendar-exception-type-code="holiday-001"
+      <calendar-exception calendar-exception-type-code="HOLIDAY"
       hours="0" date="2011-05-31"
       code="000-000" />
-      <calendar-exception calendar-exception-type-code="leave-001"
+      <calendar-exception calendar-exception-type-code="LEAVE"
       hours="8" date="2010-04-11"
       code="000-001" />
-      <calendar-exception calendar-exception-type-code="strike-001"
+      <calendar-exception calendar-exception-type-code="STRIKE"
       hours="8" date="2010-05-17"
       code="000-002" />
-      <calendar-exception calendar-exception-type-code="holiday-001"
+      <calendar-exception calendar-exception-type-code="HOLIDAY"
       hours="7" date="2010-04-22"
       code="000-003" />
     </calendar-exception-list>