From 114f09799f5bd25c701eb71399331ad005a22936 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 19 Oct 2009 09:37:04 +0200
Subject: [PATCH] ItEr30S06CUAltaMaquina: Edit Machine

---
 .../web/resources/machine/IMachineModel.java  |  2 ++
 .../machine/MachineCRUDController.java        |  2 +-
 .../web/resources/machine/MachineModel.java   | 20 +++++++++++++++++++
 .../webapp/resources/machine/_editMachine.zul | 12 +++++------
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/IMachineModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/IMachineModel.java
index d4a9961c5..da7b084cc 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/IMachineModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/IMachineModel.java
@@ -38,4 +38,6 @@ public interface IMachineModel {
 
     void confirmSave() throws ValidationException;
 
+    void initEdit(Machine machine);
+
 }
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 cb4abcd17..cc2c25aab 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
@@ -92,7 +92,7 @@ public class MachineCRUDController extends GenericForwardComposer {
     }
 
     public void goToEditForm(Machine machine) {
-        // model.initEdit(machine);
+        machineModel.initEdit(machine);
         editWindow.setTitle(_("Edit machine"));
         showEditWindow();
         Util.reloadBindings(editWindow);
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
index efe137b3b..5fac30d4a 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
@@ -22,8 +22,10 @@ package org.navalplanner.web.resources.machine;
 
 import java.util.List;
 
+import org.apache.commons.lang.Validate;
 import org.hibernate.validator.ClassValidator;
 import org.hibernate.validator.InvalidValue;
+import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.resources.daos.IMachineDAO;
 import org.navalplanner.business.resources.daos.IResourceDAO;
@@ -77,4 +79,22 @@ public class MachineModel implements IMachineModel {
         resourceDAO.save(machine);
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public void initEdit(Machine machine) {
+        Validate.notNull(machine);
+        this.machine = getFromDB(machine);
+    }
+
+    private Machine getFromDB(Machine machine) {
+        return getFromDB(machine.getId());
+    }
+
+    private Machine getFromDB(Long id) {
+        try {
+            return (Machine) resourceDAO.find(id);
+        } catch (InstanceNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
index 2e9cbbe33..d12d1645e 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul
@@ -36,18 +36,18 @@
                     <rows>
                         <row>
                             <label value="${i18n:_('Code')}" />
-                            <textbox
-                                value="@{controller.machine.code}" constraint="no empty" width="500px"/>
+                            <textbox value="@{controller.machine.code}" width="500px"
+                                constraint="no empty:${i18n:_('cannot be null or empty')}" />
                         </row>
                         <row>
                             <label value="${i18n:_('Name')}" />
-                            <textbox
-                                value="@{controller.machine.name}" constraint="no empty" width="500px"/>
+                            <textbox value="@{controller.machine.name}" width="500px"
+                                constraint="no empty:${i18n:_('cannot be null or empty')}" />
                         </row>
                         <row>
                             <label value="${i18n:_('Description')}" />
-                            <textbox
-                                value="@{controller.machine.description}" constraint="no empty" width="500px"/>
+                            <textbox value="@{controller.machine.description}" width="500px"
+                                constraint="no empty:${i18n:_('cannot be null or empty')}" />
                         </row>
                     </rows>
                 </grid>