From ae33db67ac85535dcecf1c0b78c1b5b4a3deb63e Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Wed, 25 Nov 2009 18:02:40 +0100
Subject: [PATCH]  ItEr36S07ValidacionEProbasFuncionaisItEr35S08: Changed the
 way to create calendars when saving a resource.

---
 .../business/calendars/entities/BaseCalendar.java             | 4 ++--
 .../web/resources/machine/MachineCRUDController.java          | 4 +---
 .../web/resources/worker/WorkerCRUDController.java            | 4 +---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
index 427c75021..d0a11ea8c 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
@@ -362,8 +362,8 @@ public class BaseCalendar extends BaseEntity implements IWorkHours {
         return derivedCalendar;
     }
 
-    public BaseCalendar newDerivedResourceCalendar() {
-        BaseCalendar derivedCalendar = ResourceCalendar.create();
+    public ResourceCalendar newDerivedResourceCalendar() {
+        ResourceCalendar derivedCalendar = ResourceCalendar.create();
         derivedCalendar.setParent(this);
         return derivedCalendar;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
index ea0f45e02..dfd49f115 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java
@@ -254,10 +254,8 @@ public class MachineCRUDController extends GenericForwardComposer {
         if (parentCalendar == null) {
             parentCalendar = machineModel.getDefaultCalendar();
         }
-        resourceCalendarModel.initCreateDerived(parentCalendar);
 
-        machineModel.setCalendar((ResourceCalendar) resourceCalendarModel
-                .getBaseCalendar());
+        machineModel.setCalendar(parentCalendar.newDerivedResourceCalendar());
     }
 
     private Window editCalendarWindow;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
index 53ae98a0e..fbe2cc890 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java
@@ -340,10 +340,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements
         if (parentCalendar == null) {
             parentCalendar = workerModel.getDefaultCalendar();
         }
-        resourceCalendarModel.initCreateDerived(parentCalendar);
 
-        workerModel.setCalendar((ResourceCalendar) resourceCalendarModel
-                .getBaseCalendar());
+        workerModel.setCalendar(parentCalendar.newDerivedResourceCalendar());
     }
 
     public void editCalendar() {