From bf73efa559799b7bee1235d5c00304deae38389b Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 4 Sep 2012 07:42:49 +0200
Subject: [PATCH] Change method getOrder in IOrderModel to return an Order

Removed unneeded casts due to return type change.
---
 .../java/org/libreplan/web/orders/IOrderModel.java    |  2 +-
 .../org/libreplan/web/orders/OrderCRUDController.java | 11 ++++++-----
 .../java/org/libreplan/web/orders/OrderModel.java     |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
index 21eee591b..91a998699 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/IOrderModel.java
@@ -73,7 +73,7 @@ public interface IOrderModel extends IIntegrationEntityModel {
 
     List<QualityForm> getQualityForms();
 
-    OrderLineGroup getOrder();
+    Order getOrder();
 
     IOrderElementModel getOrderElementModel(OrderElement orderElement);
 
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index cd4518eb2..fbfc147a5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -481,7 +481,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     private IOrderElementModel getOrderElementModel() {
-        final Order order = (Order) orderModel.getOrder();
+        final Order order = orderModel.getOrder();
         return orderModel.getOrderElementModel(order);
     }
 
@@ -635,7 +635,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void initOrderAuthorizations() {
         Component orderElementAuthorizations = editWindow
                 .getFellowIfAny("orderElementAuthorizations");
-        final Order order = (Order) orderModel.getOrder();
+        final Order order = orderModel.getOrder();
         if (order.isNewObject()) {
             orderAuthorizationController.initCreate(orderModel
                     .getPlanningState());
@@ -659,7 +659,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public Order getOrder() {
-        return (Order) orderModel.getOrder();
+        return orderModel.getOrder();
     }
 
     public void saveAndContinue() {
@@ -668,7 +668,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void saveAndContinue(boolean showSaveMessage) {
 
-        Order order = (Order) orderModel.getOrder();
+        Order order = orderModel.getOrder();
         final boolean isNewObject = order.isNewObject();
         setCurrentTab();
         Tab previousTab = getCurrentTab();
@@ -1451,7 +1451,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     private boolean readOnly = true;
 
     private void updateDisabilitiesOnInterface() {
-        Order order = (Order) orderModel.getOrder();
+        Order order = orderModel.getOrder();
 
         boolean permissionForWriting = orderModel.userCanWrite(order,
                 SecurityUtils.getSessionUserLoginName());
@@ -1680,4 +1680,5 @@ public class OrderCRUDController extends GenericForwardComposer {
     public String getCurrencySymbol() {
         return Util.getCurrencySymbol();
     }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index 96004cb27..e09c6fee5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -498,7 +498,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
     }
 
     @Override
-    public OrderLineGroup getOrder() {
+    public Order getOrder() {
         return planningState.getOrder();
     }