From f2522839ade415ece7a35efd8f3102921580d8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Sat, 16 Jan 2010 18:56:16 +0100
Subject: [PATCH] ItEr43S09ImplantacionAplicacionItEr42S13: [Bug #241] Fixing
 bug. Initializing labels when being retrieved.

The problem was that the data bindings were retrieving the labels
before being initialized.
---
 .../java/org/navalplanner/web/orders/OrderModel.java  |  1 +
 .../web/orders/labels/AssignedLabelsModel.java        |  1 +
 .../web/orders/labels/LabelsOnConversation.java       | 11 ++++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
index 2109457bd..bde4efbbe 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
@@ -123,6 +123,7 @@ public class OrderModel implements IOrderModel {
     private IOrderSequenceDAO orderSequenceDAO;
 
     @Override
+    @Transactional(readOnly = true)
     public List<Label> getLabels() {
         return getLabelsOnConversation().getLabels();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
index 62070d2ed..f44d3049f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/AssignedLabelsModel.java
@@ -180,6 +180,7 @@ public abstract class AssignedLabelsModel<T> implements IAssignedLabelsModel<T>
         return false;
     }
 
+    @Transactional(readOnly = true)
     public List<Label> getAllLabels() {
         return getLabelsOnConversation();
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsOnConversation.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsOnConversation.java
index e25274944..a2f85eef7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsOnConversation.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsOnConversation.java
@@ -37,28 +37,32 @@ public class LabelsOnConversation {
 
     private final ILabelDAO labelDAO;
 
-    private Set<Label> labels = new HashSet<Label>();
+    private Set<Label> labels = null;
 
     public LabelsOnConversation(ILabelDAO labelDAO) {
         this.labelDAO = labelDAO;
     }
 
     public List<Label> getLabels() {
+        if (labels == null) {
+            initializeLabels();
+        }
         return new ArrayList<Label>(labels);
     }
 
     public void addLabel(Label label) {
+        initializeLabels();
         Validate.notNull(label);
         labels.add(label);
     }
 
     public void initializeLabels() {
-        if (!labels.isEmpty()) {
+        if (this.labels != null) {
             return;
         }
         final List<Label> labels = labelDAO.getAll();
         initializeLabels(labels);
-        labels.addAll(labels);
+        this.labels = new HashSet<Label>(labels);
     }
 
     private void initializeLabels(Collection<Label> labels) {
@@ -73,6 +77,7 @@ public class LabelsOnConversation {
     }
 
     public void reattachLabels() {
+        initializeLabels();
         for (Label each : labels) {
             labelDAO.reattach(each);
         }