From 8860ca179537689b5e1f862c01f06404b9df44a3 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 13 Oct 2009 10:23:42 +0200
Subject: [PATCH]  ItEr29S14ProcuraOrganizacionsTraballo: Provide
 OrderElementModel access to orderModel

OrderModel is responsible of fetching list of Labels, which can be later modified by OrderElementModel. Both models are part of the same conversation and need to share list of Labels.
---
 .../web/orders/AssignedLabelsToOrderElementController.java | 2 ++
 .../web/orders/AssignedLabelsToOrderElementModel.java      | 7 +++++++
 .../web/orders/IAssignedLabelsToOrderElementModel.java     | 6 ++++++
 .../org/navalplanner/web/orders/IOrderElementModel.java    | 2 ++
 .../org/navalplanner/web/orders/OrderElementModel.java     | 6 ++++++
 5 files changed, 23 insertions(+)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
index 14cd6f101..927b37785 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
@@ -68,6 +68,8 @@ public class AssignedLabelsToOrderElementController extends
     }
 
     public void openWindow(IOrderElementModel orderElementModel) {
+        assignedLabelsToOrderElementModel.setOrderModel(orderElementModel
+                .getOrderModel());
         openWindow(orderElementModel.getOrderElement());
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
index 5d9c8d83a..511dcb0be 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
@@ -59,6 +59,8 @@ public class AssignedLabelsToOrderElementModel implements
 
     OrderElement orderElement;
 
+    IOrderModel orderModel;
+
     Set<Label> cacheLabels = new HashSet<Label>();
 
     @Override
@@ -237,4 +239,9 @@ public class AssignedLabelsToOrderElementModel implements
         reattachLabels();
         orderDAO.save(orderElement);
     }
+
+    @Override
+    public void setOrderModel(IOrderModel orderModel) {
+        this.orderModel = orderModel;
+    }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
index 9e159b2ba..daf7328a9 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java
@@ -118,4 +118,10 @@ public interface IAssignedLabelsToOrderElementModel {
      */
     void confirm();
 
+    /**
+     *
+     * @param orderModel
+     */
+    void setOrderModel(IOrderModel orderModel);
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderElementModel.java
index 69ba0f4ed..e322aa9d1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderElementModel.java
@@ -43,4 +43,6 @@ public interface IOrderElementModel {
     Set<Criterion> getCriterionsHoursGroup(HoursGroup hoursGroup);
 
     CriterionType getCriterionType(Criterion criterion);
+
+    IOrderModel getOrderModel();
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java
index 497877f02..79747524f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java
@@ -62,6 +62,11 @@ public class OrderElementModel implements IOrderElementModel {
         return orderElement;
     }
 
+    @Override
+    public IOrderModel getOrderModel() {
+        return order;
+    }
+
     @Override
     @Transactional(readOnly = true)
     public void setCurrent(OrderElement orderElement, OrderModel order) {
@@ -121,4 +126,5 @@ public class OrderElementModel implements IOrderElementModel {
         criterionType.getName();
         return criterionType;
     }
+
 }