From 8976b8ed42b3b34a51a21f89c2243461f5a0dc65 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Tue, 4 Aug 2009 11:56:06 +0200
Subject: [PATCH]  ItEr20S04ArquitecturaServidorItEr19S04: Fixed casting
 problem when an Order is not valid.

---
 .../web/common/MessagesForUser.java           |  3 +--
 .../web/orders/OrderCRUDController.java       | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
index 1b450a375..d5f39a791 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
@@ -8,7 +8,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.ValidationException;
-import org.navalplanner.business.orders.entities.OrderElement;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -103,7 +102,7 @@ public class MessagesForUser extends GenericForwardComposer implements
         addMessage(createLabelFor(invalidValue));
     }
 
-    private Component createLabelFor(InvalidValue invalidValue){
+    public static Label createLabelFor(InvalidValue invalidValue) {
         Label result = new Label();
         result.setValue(invalidValue.getPropertyName() + ": "
                 + invalidValue.getMessage());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index e38b66a4b..10dfbf379 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -76,11 +76,20 @@ public class OrderCRUDController extends GenericForwardComposer {
 
                 @Override
                 public Component createLabelFor(InvalidValue invalidValue) {
-                    Label result= new Label();
-                    String orderElementName = ((OrderElement)invalidValue.getBean()).getName();
-                    result.setValue(orderElementName+" "+invalidValue.getPropertyName() + ": "
-                    + invalidValue.getMessage());
-                    return result;
+                    if (invalidValue.getBean() instanceof OrderElement) {
+                        Label result = new Label();
+
+                        String orderElementName = ((OrderElement) invalidValue
+                                        .getBean()).getName();
+
+                        result.setValue(orderElementName + " "
+                                        + invalidValue.getPropertyName() + ": "
+                                        + invalidValue.getMessage());
+                        return result;
+                    } else {
+                        return MessagesForUser
+                                        .createLabelFor(invalidValue);
+                    }
                 }
             });
         }