From e6abaf27f167d8aef829334c2adccbe1ce95aa97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Fri, 11 Nov 2011 11:23:14 +0100
Subject: [PATCH] Removed unnnecesary elements from DynamicDatebox component

FEA: ItEr75S04BugFixing
---
 .../org/libreplan/web/orders/DynamicDatebox.java  | 15 +++------------
 .../web/orders/OrderElementTreeController.java    |  4 ++--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java
index f6d6d2dc4..4c07b315f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/DynamicDatebox.java
@@ -29,6 +29,7 @@ import org.libreplan.business.orders.entities.OrderElement;
 import org.zkoss.ganttz.util.ComponentsFinder;
 import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Component;
+import org.zkoss.zk.ui.HtmlMacroComponent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
@@ -46,8 +47,6 @@ import org.zkoss.zul.Textbox;
  */
 public class DynamicDatebox extends GenericForwardComposer {
 
-    private final OrderElement orderElement;
-
     final Getter<Date> getter;
 
     final Setter<Date> setter;
@@ -60,19 +59,14 @@ public class DynamicDatebox extends GenericForwardComposer {
 
     private boolean disabled = false;
 
-    public DynamicDatebox(final OrderElement orderElement, Getter<Date> getter,
+    public DynamicDatebox(Getter<Date> getter,
             Setter<Date> setter) {
-        this.orderElement = orderElement;
         this.setter = setter;
         this.getter = getter;
         this.dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, Locales
                 .getCurrent());
     }
 
-    public OrderElement getOrderElement() {
-        return orderElement;
-    }
-
     public Datebox createDateBox() {
         dateBox = new Datebox();
         dateBox.setFormat("short");
@@ -104,7 +98,6 @@ public class DynamicDatebox extends GenericForwardComposer {
         associatedTextBox.setVisible(false);
         getDateBox();
         createDateBox();
-        dateBox.setVisible(true);
         dateBox.setFocus(true);
         dateBox.setOpen(true);
     }
@@ -125,9 +118,8 @@ public class DynamicDatebox extends GenericForwardComposer {
         associatedTextBox.setVisible(true);
     }
 
-    @Override
+
     public void doAfterCompose(Component component) throws Exception {
-        super.doAfterCompose(component);
         findComponents((Hbox) component);
         registerListeners();
         updateComponents();
@@ -212,7 +204,6 @@ public class DynamicDatebox extends GenericForwardComposer {
     public void updateBean() {
         Date date = getDateBox().getValue();
         setter.set(date);
-
     }
 
     private void updateComponents() {
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
index 02ef2dd9a..c39241884 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
@@ -429,7 +429,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
 
         void addInitDateCell(final OrderElement currentOrderElement) {
             DynamicDatebox dinamicDatebox = new DynamicDatebox(
-                    currentOrderElement, new DynamicDatebox.Getter<Date>() {
+                    new DynamicDatebox.Getter<Date>() {
 
                         @Override
                         public Date get() {
@@ -451,7 +451,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
 
         void addEndDateCell(final OrderElement currentOrderElement) {
             DynamicDatebox dinamicDatebox = new DynamicDatebox(
-                    currentOrderElement, new DynamicDatebox.Getter<Date>() {
+                    new DynamicDatebox.Getter<Date>() {
 
                         @Override
                         public Date get() {